Commit b88f6e47ac900284988bba54117264e32031cb57
Exists in
staging
and in
1 other branch
Merge branch 'master' into staging
Showing
3 changed files
with
9 additions
and
5 deletions
Show diff stats
index.html
| @@ -332,7 +332,10 @@ | @@ -332,7 +332,10 @@ | ||
| 332 | </thead> | 332 | </thead> |
| 333 | <tbody></tbody> | 333 | <tbody></tbody> |
| 334 | </table> | 334 | </table> |
| 335 | - <a href="#/programas/{{id}}/resultados" class="vote-result" style="display: block; font-size: 20px; margin: 10px 0; font-weight: bold;">Resultado geral</a> | 335 | + <p style="font-size: 20px; margin: 10px 0;"> |
| 336 | + Onde estão as outras propostas? Clique aqui e veja o | ||
| 337 | + <a href="#/programas/{{id}}/resultados" class="vote-result" style="font-weight: bold;">Resultado geral</a> | ||
| 338 | + </p> | ||
| 336 | </div> | 339 | </div> |
| 337 | 340 | ||
| 338 | <div class="results-container hide col-sm-12"></div> | 341 | <div class="results-container hide col-sm-12"></div> |
js/main.js
| @@ -260,7 +260,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | @@ -260,7 +260,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | ||
| 260 | var $tbody = $containerTopProposals.find('tbody'); | 260 | var $tbody = $containerTopProposals.find('tbody'); |
| 261 | 261 | ||
| 262 | if ( $containerTopProposals.css('display') === 'block' ) { | 262 | if ( $containerTopProposals.css('display') === 'block' ) { |
| 263 | - console.log('Top ranking already loaded.'); | 263 | + // console.debug('Top ranking already loaded.'); |
| 264 | return; | 264 | return; |
| 265 | } | 265 | } |
| 266 | 266 | ||
| @@ -291,7 +291,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | @@ -291,7 +291,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | ||
| 291 | 291 | ||
| 292 | $containerTopProposals.css('display', 'block'); | 292 | $containerTopProposals.css('display', 'block'); |
| 293 | 293 | ||
| 294 | - console.log('data', data); | 294 | + // console.log('data', data); |
| 295 | 295 | ||
| 296 | }); | 296 | }); |
| 297 | }, | 297 | }, |
| @@ -1592,7 +1592,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | @@ -1592,7 +1592,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | ||
| 1592 | $message.html('Verifique seu email para efetuar a troca da senha.'); | 1592 | $message.html('Verifique seu email para efetuar a troca da senha.'); |
| 1593 | $message.show(); | 1593 | $message.show(); |
| 1594 | }).fail(function(data) { | 1594 | }).fail(function(data) { |
| 1595 | - console.log(data.responseJSON); | 1595 | + // console.error(data.responseJSON); |
| 1596 | 1596 | ||
| 1597 | Main.reloadCaptcha($forgotPasswordForm.find('#serpro_captcha')[0]); | 1597 | Main.reloadCaptcha($forgotPasswordForm.find('#serpro_captcha')[0]); |
| 1598 | var $message = $forgotPasswordForm.find('.message'); | 1598 | var $message = $forgotPasswordForm.find('.message'); |
sass/style.sass
| @@ -1409,7 +1409,8 @@ h3.titulo-destaque | @@ -1409,7 +1409,8 @@ h3.titulo-destaque | ||
| 1409 | border-color: darken($color, $darken) | 1409 | border-color: darken($color, $darken) |
| 1410 | 1410 | ||
| 1411 | .freeze--theme-message p, | 1411 | .freeze--theme-message p, |
| 1412 | - .freeze--program-message p | 1412 | + .freeze--program-message p, |
| 1413 | + .freeze--top-proposals p | ||
| 1413 | color: $color | 1414 | color: $color |
| 1414 | 1415 | ||
| 1415 | .icon | 1416 | .icon |