Download as
Browse Code »

Commit e847b1bd81bc7de5f5fa7a357c6d1b49b37006a5

Authored by Leonardo Merlin
1 parent 4c6f253a
Exists in master and in 5 other branches build, build2, contigency_plan_recaptcha, production, staging

Revert "Merge branch 'merlin'" 

This reverts commit 4c6f253a2bf26d20e3ed12588e466264108a1f30, reversing
changes made to aab3f021118858bfc03089a92e66681271a1b98c.
Showing 3 changed files with 18 additions and 31 deletions   Show diff stats
index.html
  Diff comments   View file @e847b1b
... ... @@ -196,20 +196,21 @@
196 196 {{!-- <div class="container"> --}}
197 197 <article class="proposal-detail hide" id="proposal-item-{{id}}">
198 198 <div class="categories {{#each categories}}{{slug}}{{/each}}">
199   -
200   - <div class="row">
201   - <div class="col-xs-12">
202   - <div class="select">
203   - {{#each categories}}
204   - <div class="category proposal-category" data-category="{{slug}}">
205   - <button class="go-back btn btn-default"><span class="fa fa-reply"></span> Voltar</button>
206   - <a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">{{name}}</a>
207   - {{#select_proposal ../../article.children slug ../id}}{{/select_proposal}}
208   - </div>
209   - {{/each}}
  199 +
  200 + <div class="select">
  201 + {{#each categories}}
  202 + <div class="category proposal-category" data-category="{{slug}}">
  203 + <button class="go-back btn btn-default">
  204 + <span class="fa fa-reply"></span>
  205 + Voltar
  206 + </button>
  207 + <a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">{{name}}</a>
  208 + {{#select_proposal ../../article.children slug ../id}}{{/select_proposal}}
210 209 </div>
211   - </div>
  210 + {{/each}}
212 211 </div>
  212 +
  213 +
213 214 <div class="proposal-header">
214 215 <div class="abstract">
215 216 <img src="{{../host}}{{image.url}}" alt="Imagem de apresentação do programa."/>
... ...
js/jquery.equalHeights.js
  Diff comments   View file @e847b1b
... ... @@ -5,12 +5,12 @@ $.fn.equalHeights = function(px) {
5 5 $(this).each(function(index, item){
6 6 var $item = $(item);
7 7 $item.height('auto'); // force a 'recalc' height
8   - var h = $item.height();
9   - if ( h > currentTallest) { currentTallest = h; }
  8 +
  9 + if ($item.height() > currentTallest) { currentTallest = $item.height(); }
10 10 if (!px && Number.prototype.pxToEm) { currentTallest = currentTallest.pxToEm(); } //use ems unless px is specified
11 11 // for ie6, set height since min-height isn't supported
12 12 if (typeof(document.body.style.minHeight) === 'undefined') { $item.css({'height': currentTallest}); }
13   - $item.height(currentTallest);
  13 + $item.css({'height': currentTallest});
14 14 });
15 15 return this;
16 16 };
... ...
js/main.js
  Diff comments   View file @e847b1b
... ... @@ -316,7 +316,6 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
316 316 // this.randomProposalByTheme(['category-saude', 'category-seguranca-publica', 'category-educacao', 'category-reducao-da-pobreza']);
317 317 $('.proposal-item').show(); /* Show all programs */
318 318 $('#proposal-group').show();
319   - $('.content').addClass('background');
320 319 $('#proposal-categories').show();
321 320 $('.proposal-category-items').hide();
322 321 $('#nav-proposal-group a').addClass('active');
... ... @@ -702,7 +701,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
702 701 e.preventDefault();
703 702 var $bt = $(this);
704 703 if(!logged_in) {
705   - $('#login-panel').show();
  704 + $('#login-button').click();
706 705 $('html, body').animate({scrollTop: 0}, 'fast');
707 706 } else {
708 707 $.ajax({
... ... @@ -838,7 +837,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
838 837 $(document).click(function(e){
839 838 var $target = $(e.target);
840 839  
841   - var isLoginButton = ($target.closest('#login-button').length !== 0);
  840 + var isLoginButton = ($target.attr('id') === 'login-button');
842 841 var requireLogin = $target.hasClass('require-main-login');
843 842 var isChildOfPanel = ($target.closest(loginPanelId).length !== 0);
844 843  
... ... @@ -1176,19 +1175,6 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
1176 1175 e.preventDefault();
1177 1176 });
1178 1177  
1179   - // hack-fix IE iframe video over 9999 z-index div.
1180   - $('iframe').each(function(){
1181   - var $iframe = $(this);
1182   - var url = $iframe.attr('src');
1183   - var c = '?';
1184   -
1185   - if(url.indexOf("?") != -1){
1186   - c = "&";
1187   - }
1188   -
1189   - $iframe.attr("src",url+c+"wmode=transparent");
1190   - });
1191   -
1192 1178 });
1193 1179  
1194 1180 window.addEventListener("message", function(ev) {
... ...