Commit 723e491c6b7baab6b31cd532822a117d746cb6de
1 parent
a8a94af7
Exists in
master
and in
6 other branches
Remoção de hide
Showing
3 changed files
with
58 additions
and
59 deletions
Show diff stats
index.html
@@ -114,6 +114,7 @@ | @@ -114,6 +114,7 @@ | ||
114 | </div> | 114 | </div> |
115 | </div> | 115 | </div> |
116 | 116 | ||
117 | + <!-- | ||
117 | <nav class="tab" role="tabpanel"> | 118 | <nav class="tab" role="tabpanel"> |
118 | <ul role="tablist"> | 119 | <ul role="tablist"> |
119 | <li id="nav-proposal-categories" role="presentation"> | 120 | <li id="nav-proposal-categories" role="presentation"> |
@@ -124,44 +125,51 @@ | @@ -124,44 +125,51 @@ | ||
124 | </li> | 125 | </li> |
125 | </ul> | 126 | </ul> |
126 | </nav> | 127 | </nav> |
128 | + --> | ||
129 | + | ||
130 | + <div class="col-sm-3"> | ||
131 | + <aside id="proposal-categories"> | ||
132 | + <div id="proposal-categories-container"> | ||
133 | + <ul class="themes"> | ||
134 | + {{#each article.categories}} | ||
135 | + <li id="proposal-category-{{slug}}" class="proposal-category" data-category="{{slug}}"> | ||
136 | + <a href="#/temas/{{slug}}/{{id}}" class="proposal-link " data-target="proposal-item-{{id}}">{{name}}</a> | ||
137 | + <!-- <div class="arrow-box" style="display: none"></div> --> | ||
138 | + </li> | ||
139 | + {{/each}} | ||
140 | + </ul> | ||
141 | + {{#each article.categories}} | ||
142 | + <section id="proposal-item-{{id}}" class="proposal-category-items proposal-category-items-{{slug}} hide proposal-container clearfix {{slug}}" data-category="{{slug}}"> | ||
143 | + <div class="header"> | ||
144 | + <div class="name">{{name}}</div> | ||
145 | + <div class="description"></div> | ||
146 | + </div> | ||
147 | + <ul class="proposal-list"> | ||
148 | + {{#list_proposal ../article.children category=slug}} | ||
149 | + {{#link title id}}{{/link}} | ||
150 | + {{/list_proposal}} | ||
151 | + </ul> | ||
152 | + </section> | ||
153 | + {{/each}} | ||
154 | + </div> | ||
155 | + </aside> | ||
156 | + </div> | ||
127 | 157 | ||
128 | - <aside id="proposal-categories"> | ||
129 | - <div id="proposal-categories-container"> | ||
130 | - <ul class="themes"> | ||
131 | - {{#each article.categories}} | ||
132 | - <li id="proposal-category-{{slug}}" class="proposal-category" data-category="{{slug}}"> | ||
133 | - <a href="#/temas/{{slug}}/{{id}}" class="proposal-link hvr-float-shadow" data-target="proposal-item-{{id}}">{{name}}</a> | ||
134 | - <div class="arrow-box" style="display: none"></div> | ||
135 | - </li> | ||
136 | - {{/each}} | 158 | + <div class="col-sm-9"> |
159 | + <article id="proposal-group" class=""> | ||
160 | + <!-- | ||
161 | + <label for="search-input">Selecione um programa para fazer propostas e contar sua experiência.</label> | ||
162 | + <div id="search-input-container"> | ||
163 | + <input placeholder="palavra chave" id="search-input" type="text" name="search" /> | ||
164 | + </div> | ||
165 | + --> | ||
166 | + <ul class="proposal-list"> | ||
167 | + {{#list_proposal article.children}} | ||
168 | + {{#link title id}}{{/link}} | ||
169 | + {{/list_proposal}} | ||
137 | </ul> | 170 | </ul> |
138 | - {{#each article.categories}} | ||
139 | - <section id="proposal-item-{{id}}" class="proposal-category-items proposal-category-items-{{slug}} hide proposal-container clearfix {{slug}}" data-category="{{slug}}"> | ||
140 | - <div class="header"> | ||
141 | - <div class="name">{{name}}</div> | ||
142 | - <div class="description"></div> | ||
143 | - </div> | ||
144 | - <ul class="proposal-list"> | ||
145 | - {{#list_proposal ../article.children category=slug}} | ||
146 | - {{#link title id}}{{/link}} | ||
147 | - {{/list_proposal}} | ||
148 | - </ul> | ||
149 | - </section> | ||
150 | - {{/each}} | ||
151 | - </div> | ||
152 | - </aside> | ||
153 | - | ||
154 | - <article id="proposal-group" class="hide"> | ||
155 | - <label for="search-input">Selecione um programa para fazer propostas e contar sua experiência.</label> | ||
156 | - <div id="search-input-container"> | ||
157 | - <input placeholder="palavra chave" id="search-input" type="text" name="search" /> | ||
158 | - </div> | ||
159 | - <ul class="proposal-list"> | ||
160 | - {{#list_proposal article.children}} | ||
161 | - {{#link title id}}{{/link}} | ||
162 | - {{/list_proposal}} | ||
163 | - </ul> | ||
164 | - </article> | 171 | + </article> |
172 | + </div> | ||
165 | 173 | ||
166 | {{#each article.children}} | 174 | {{#each article.children}} |
167 | {{!-- <div class="container"> --}} | 175 | {{!-- <div class="container"> --}} |
js/main.js
@@ -224,19 +224,19 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -224,19 +224,19 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
224 | return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4(); | 224 | return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4(); |
225 | }, | 225 | }, |
226 | display_category_tab: function(){ | 226 | display_category_tab: function(){ |
227 | - $('#proposal-group').hide(); | 227 | + // $('#proposal-group').hide(); |
228 | $('#proposal-categories').show(); | 228 | $('#proposal-categories').show(); |
229 | $('#nav-proposal-categories a').addClass('active'); | 229 | $('#nav-proposal-categories a').addClass('active'); |
230 | $('#nav-proposal-group a').removeClass('active'); | 230 | $('#nav-proposal-group a').removeClass('active'); |
231 | $('.proposal-category-items').hide(); | 231 | $('.proposal-category-items').hide(); |
232 | - $('.proposal-category .arrow-box').hide(); | 232 | + // $('.proposal-category .arrow-box').hide(); |
233 | $('.proposal-detail').hide(); | 233 | $('.proposal-detail').hide(); |
234 | 234 | ||
235 | $('#content').show(); | 235 | $('#content').show(); |
236 | $('nav').show(); | 236 | $('nav').show(); |
237 | }, | 237 | }, |
238 | display_proposals_tab: function(){ | 238 | display_proposals_tab: function(){ |
239 | - $('#proposal-categories').hide(); | 239 | + // $('#proposal-categories').hide(); |
240 | $('#proposal-group').show(); | 240 | $('#proposal-group').show(); |
241 | $('#nav-proposal-group a').addClass('active'); | 241 | $('#nav-proposal-group a').addClass('active'); |
242 | $('#nav-proposal-categories a').removeClass('active'); | 242 | $('#nav-proposal-categories a').removeClass('active'); |
@@ -329,9 +329,9 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -329,9 +329,9 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
329 | $('html, body').animate({ scrollTop: itemOffset.top }, 'fast'); | 329 | $('html, body').animate({ scrollTop: itemOffset.top }, 'fast'); |
330 | } | 330 | } |
331 | } ); | 331 | } ); |
332 | - $('.proposal-category .arrow-box').hide(); | 332 | + // $('.proposal-category .arrow-box').hide(); |
333 | var categorySlug = $item.data('category'); | 333 | var categorySlug = $item.data('category'); |
334 | - $('#proposal-category-' + categorySlug).find('.arrow-box').show(); | 334 | + // $('#proposal-category-' + categorySlug).find('.arrow-box').show(); |
335 | 335 | ||
336 | } | 336 | } |
337 | }, | 337 | }, |
sass/_proposal_categories.scss
1 | @import "utilities/variables"; | 1 | @import "utilities/variables"; |
2 | 2 | ||
3 | #proposal-categories { | 3 | #proposal-categories { |
4 | - background: #fff; | ||
5 | - clear: both; | ||
6 | - margin: 0; | ||
7 | - padding: 10px; | ||
8 | - text-align: left; | ||
9 | - border-bottom: 1px solid #03316f; | ||
10 | - border-left: 1px solid #03316f; | ||
11 | - border-right: 1px solid #03316f; | 4 | + // background: #fff; |
5 | + // clear: both; | ||
6 | + // margin: 0; | ||
7 | + // padding: 10px; | ||
8 | + // text-align: left; | ||
9 | + // border-bottom: 1px solid #03316f; | ||
10 | + // border-left: 1px solid #03316f; | ||
11 | + // border-right: 1px solid #03316f; | ||
12 | ul { | 12 | ul { |
13 | padding-left: 0; | 13 | padding-left: 0; |
14 | } | 14 | } |
@@ -21,23 +21,14 @@ | @@ -21,23 +21,14 @@ | ||
21 | a { | 21 | a { |
22 | text-decoration: none; | 22 | text-decoration: none; |
23 | color: #fff; | 23 | color: #fff; |
24 | - margin: 10px; | ||
25 | - -webkit-border-radius: 6px; | ||
26 | - -moz-border-radius: 6px; | ||
27 | - border-radius: 6px; | ||
28 | background-position: center 15px; | 24 | background-position: center 15px; |
29 | background-repeat: no-repeat; | 25 | background-repeat: no-repeat; |
30 | width: 140px; | 26 | width: 140px; |
31 | display: inline-block; | 27 | display: inline-block; |
32 | font-size: 14px; | 28 | font-size: 14px; |
33 | - font-family: 'Asap', sans; | ||
34 | font-weight: 700; | 29 | font-weight: 700; |
35 | - text-align: center; | ||
36 | - padding-top: 110px; | ||
37 | - min-height: 140px; | ||
38 | background-size: 90px; | 30 | background-size: 90px; |
39 | - cursor: pointer; | ||
40 | - | 31 | + text-transform: uppercase; |
41 | &:hover { | 32 | &:hover { |
42 | border-color: #fff !important; | 33 | border-color: #fff !important; |
43 | } | 34 | } |