-
-
-
-
diff --git a/js/jquery.equalHeights.js b/js/jquery.equalHeights.js
index b10c24e..7a19515 100644
--- a/js/jquery.equalHeights.js
+++ b/js/jquery.equalHeights.js
@@ -5,12 +5,12 @@ $.fn.equalHeights = function(px) {
$(this).each(function(index, item){
var $item = $(item);
$item.height('auto'); // force a 'recalc' height
- var h = $item.height();
- if ( h > currentTallest) { currentTallest = h; }
+
+ if ($item.height() > currentTallest) { currentTallest = $item.height(); }
if (!px && Number.prototype.pxToEm) { currentTallest = currentTallest.pxToEm(); } //use ems unless px is specified
// for ie6, set height since min-height isn't supported
if (typeof(document.body.style.minHeight) === 'undefined') { $item.css({'height': currentTallest}); }
- $item.height(currentTallest);
+ $item.css({'height': currentTallest});
});
return this;
};
diff --git a/js/main.js b/js/main.js
index e415917..79d1c0a 100644
--- a/js/main.js
+++ b/js/main.js
@@ -316,7 +316,6 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun
// this.randomProposalByTheme(['category-saude', 'category-seguranca-publica', 'category-educacao', 'category-reducao-da-pobreza']);
$('.proposal-item').show(); /* Show all programs */
$('#proposal-group').show();
- $('.content').addClass('background');
$('#proposal-categories').show();
$('.proposal-category-items').hide();
$('#nav-proposal-group a').addClass('active');
@@ -702,7 +701,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun
e.preventDefault();
var $bt = $(this);
if(!logged_in) {
- $('#login-panel').show();
+ $('#login-button').click();
$('html, body').animate({scrollTop: 0}, 'fast');
} else {
$.ajax({
@@ -838,7 +837,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun
$(document).click(function(e){
var $target = $(e.target);
- var isLoginButton = ($target.closest('#login-button').length !== 0);
+ var isLoginButton = ($target.attr('id') === 'login-button');
var requireLogin = $target.hasClass('require-main-login');
var isChildOfPanel = ($target.closest(loginPanelId).length !== 0);
@@ -1176,19 +1175,6 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun
e.preventDefault();
});
- // hack-fix IE iframe video over 9999 z-index div.
- $('iframe').each(function(){
- var $iframe = $(this);
- var url = $iframe.attr('src');
- var c = '?';
-
- if(url.indexOf("?") != -1){
- c = "&";
- }
-
- $iframe.attr("src",url+c+"wmode=transparent");
- });
-
});
window.addEventListener("message", function(ev) {
--
libgit2 0.21.2
- {{#each categories}}
-
+
+
-
- {{name}}
- {{#select_proposal ../../article.children slug ../id}}{{/select_proposal}}
-
- {{/each}}
+
+
+ {{#each categories}}
+
+ {{/each}}
+
+ {{name}}
+ {{#select_proposal ../../article.children slug ../id}}{{/select_proposal}}
-