From a020f8b278637add03de20366c007fff88122f25 Mon Sep 17 00:00:00 2001 From: Leonardo Merlin Date: Tue, 11 Aug 2015 12:22:59 -0300 Subject: [PATCH] Fix proposal box theming --- index.html | 6 ------ js/handlebars-helpers.js | 2 +- js/main.js | 16 +++++++++++----- sass/style.sass | 14 ++++++++------ 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/index.html b/index.html index 182c1f2..4733beb 100644 --- a/index.html +++ b/index.html @@ -201,12 +201,6 @@
- Ver todos os programas

Programas

diff --git a/js/handlebars-helpers.js b/js/handlebars-helpers.js index 799efa6..b26a62f 100644 --- a/js/handlebars-helpers.js +++ b/js/handlebars-helpers.js @@ -31,7 +31,7 @@ define(['handlebars'], function(Handlebars){ element = ''; continue; } - category = category + '
' + proposal.categories[x].name + '
'; + category = category + '
' + proposal.categories[x].name + '
'; } if (element == '') { continue; diff --git a/js/main.js b/js/main.js index 6c594df..60633a5 100644 --- a/js/main.js +++ b/js/main.js @@ -370,17 +370,23 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers }, // inicio Eduardo randomProposalByTheme: function(themeClasses) { - $('#proposal-group .proposal-list .proposal-item').hide(); + var $proposalGroup = $('#proposal-group'); + var $proposalList = $proposalGroup.find('.proposal-list'); + var $proposalItem = $proposalList.find('.proposal-item'); + + $proposalItem.hide(); + $.each(themeClasses, function(i, themeClass) { - var proposalsByTheme = $('#proposal-group .proposal-list .proposal-item').find('.' + themeClass); + var proposalsByTheme = $proposalList.find('.' + themeClass); var randomizedIndex = Math.floor(Math.random() * proposalsByTheme.length); - var proposalToShow = $(proposalsByTheme[randomizedIndex]).parents().filter('.proposal-item'); - $(proposalToShow).show(); + // var proposalToShow = $(proposalsByTheme[randomizedIndex]).parents().filter('.proposal-item'); + // $(proposalToShow).show(); + $(proposalsByTheme[randomizedIndex]).show(); }); }, display_category_tab: function(){ // $('#proposal-group').hide(); - this.randomProposalByTheme(['category-saude', 'category-seguranca-publica', 'category-educacao', 'category-reducao-da-pobreza']); + this.randomProposalByTheme(['saude', 'seguranca-publica', 'educacao', 'reducao-da-pobreza', 'cultura']); $('#proposal-group').show(); /* Show random proposals*/ $('.content').addClass('background'); /* Add class background */ $('#proposal-categories').show(); diff --git a/sass/style.sass b/sass/style.sass index 5ad8aa9..0a79ae6 100644 --- a/sass/style.sass +++ b/sass/style.sass @@ -1380,17 +1380,19 @@ h3.titulo-destaque background-position: 5px 50% background-repeat: no-repeat background-size: 32px - .category-#{$category} - background-color: $color - background-position: 5px 50% - background-repeat: no-repeat - background-size: 40px - border-color: darken($color, $darken) + .category-title + background-color: $color + border-color: darken($color, $darken) .icon &-#{$category} background-color: $color background-image: url(images/icons/#{$category}.png) +.category-title + background-position: 5px 50% + background-repeat: no-repeat + background-size: 40px + // ------------------------------------ // 9 - Alto Contraste -- libgit2 0.21.2