Download as
Browse Code »

Commit e80cacf39394d171751bb1a0bb471616f3cfd6c5

Authored by Leonardo Merlin
2 parents ac0460b0 144e3910
Exists in master and in 5 other branches build, build2, contigency_plan_recaptcha, production, staging

Merge branch 'merlin'

Showing 3 changed files with 11 additions and 5 deletions   Show diff stats
index.html
  Diff comments   View file @e80cacf
... ... @@ -350,7 +350,7 @@
350 350 <div class="box box-propostas">
351 351 <div class="loading">Carregando...</div>
352 352 <div class="results-content hide">
353   - <a href="#" class="vote-result"><span class="sr-only">Fechar</span><span class="fa fa-times"></span></a>
  353 + <button class="vote-result"><span class="sr-only">Fechar</span><span class="fa fa-times"></span></button>
354 354 <h2>Resultados</h2>
355 355 <span class="total">Total de propostas para o programa {{title}}: <strong class="value">{{pagination.total}}</strong></span>
356 356 <div class="updated-at">
... ...
js/main.js
  Diff comments   View file @e80cacf
... ... @@ -121,7 +121,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
121 121 }
122 122  
123 123 if(ProposalApp.hasProposalbeenVoted(article.id)){
124   - console.log("Proposta " + article.id + " já havia sido votada");
  124 + // console.debug("Proposta " + article.id + " já havia sido votada");
125 125 Main.displaySuccess(button.closest('.support-proposal .section-content'), 'Seu voto já foi computado nesta proposta', 800);
126 126 contextMain.loadRandomProposal(topic_id);
127 127 e.preventDefault();
... ... @@ -401,7 +401,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
401 401 })
402 402 .fail(function( jqxhr, textStatus, error ) {
403 403 var err = textStatus + ', ' + error;
404   - console.log( 'Request Failed: ' + err );
  404 + // console.log( 'Request Failed: ' + err );
405 405 });
406 406 },
407 407 display_proposal_by_category: function(item){
... ... @@ -614,7 +614,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
614 614 }
615 615  
616 616 window._paq.push(['trackPageView', trackPageTitle]);
617   - console.log('tracked page view', trackPageTitle);
  617 + // console.log('tracked page view', trackPageTitle);
618 618 }
619 619 // [END] Tracking
620 620  
... ... @@ -1144,7 +1144,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
1144 1144 var loginForm = $(this).parents('#login-form');
1145 1145 var signupForm = loginForm.siblings('#signup-form');
1146 1146 window.signupForm = signupForm;
1147   - console.log("novo usuário");
  1147 + // console.log("novo usuário");
1148 1148 loginForm.hide();
1149 1149 signupForm.show();
1150 1150 signupForm.find(".password").show();
... ...
sass/style.sass
  Diff comments   View file @e80cacf
... ... @@ -895,6 +895,12 @@ td
895 895 float: left
896 896 .vote-result
897 897 float: right
  898 + background: none
  899 + border: none
  900 +
  901 + @each $category, $color in $categories
  902 + .#{$category} &
  903 + color: $color
898 904 .updated-at
899 905 @extend .vote-result
900 906 margin-top: $gutter
... ...