Download as
Browse Code »

Commit 654a0546d04b291e6978ce3678a3f6a1b845eb83

Authored by Leandro Santos
2 parents 94461391 d9a382ee
Exists in master and in 11 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, session_cookie, staging

Merge branch 'master' of gitlab.com:participa/proposal-app

Showing 2 changed files with 21 additions and 8 deletions   Show diff stats
css/style.css
  Diff comments   View file @654a054
... ... @@ -221,27 +221,28 @@ ul.category {
221 221 }
222 222  
223 223 .category > li {
224   - color: #03316f;
  224 + color: #FFFFFF;
225 225 text-align: left;
226   - display: block !important;
227 226 font-family: asap_bold;
228 227 font-size: 16px;
229   - padding: 10px 0 5px 0;
230   - border-bottom: 1px solid #03316f;
  228 + padding: 10px 10px 5px 10px;
231 229 margin-bottom: 10px;
  230 + background-color: gray;
232 231 }
233 232  
234 233 .proposal-item p {
235 234 font-size: 14px;
236 235 color: #172938;
237 236 margin: 0;
238   - padding: 10px;
239 237 padding-top: 5px;
240 238 background: #fff;
241 239 margin-bottom: 10px;
  240 + text-align: left;
242 241 }
243 242  
244 243 .proposal-item > a {
  244 + border-top: 1px dotted #03316f;
  245 + padding-top: 10px;
245 246 display: block;
246 247 margin: 0;
247 248 color: #03316f;
... ... @@ -249,6 +250,15 @@ ul.category {
249 250 font-family: asap_bold;
250 251 font-size: 16px;
251 252 text-decoration: none;
252   - padding: 10px;
253 253 background: #fff;
254 254 }
  255 +
  256 +.proposal-category-items .proposal-item {
  257 + width: 290px;
  258 + min-height: 134px;
  259 + margin: 10px;
  260 + background: #fff;
  261 + border-radius: 7px;
  262 + padding: 15px;
  263 + vertical-align: top;
  264 +}
... ...
js/main.js
  Diff comments   View file @654a054
... ... @@ -94,7 +94,7 @@ $.getJSON(noosferoAPI)
94 94 });
95 95  
96 96 function loadRandomProposal(topic_id, private_token) {
97   - var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime();
  97 + var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,author';
98 98 $.getJSON(url).done(function( data ) {
99 99 var article = data.articles.length > 0 ? data.articles[0] : null;
100 100 $('.support-proposal-container').html(supportProposalTemplate(article));
... ... @@ -103,7 +103,10 @@ function loadRandomProposal(topic_id, private_token) {
103 103 $.ajax({
104 104 type: 'post',
105 105 url: host + '/api/v1/articles/' + article.id + '/vote',
106   - data: {value: $(this).data('vote-value'), private_token: private_token}
  106 + data: {
  107 + value: $(this).data('vote-value'),
  108 + private_token: private_token
  109 + }
107 110 }).done(function( data ) {
108 111 loadRandomProposal(topic_id, private_token);
109 112 });
... ...