Download as
Browse Code »

Commit c85cfeceaef11bbca60011c3a25a04b9c21e1573

Authored by Leandro Santos
1 parent 6ffced55
Exists in master and in 5 other branches build, build2, contigency_plan_recaptcha, production, staging

adding top bar menu

Showing 4 changed files with 9 additions and 312 deletions   Show diff stats
index.html
  Diff comments   View file @c85cfec
... ... @@ -104,7 +104,13 @@
104 104 <a href="#" class="entrar">Entrar</a>
105 105 <a href="#" class="logout hide">Sair</a>
106 106 </div>
107   - <h1><a href="#">{{article.title}}</a></h1>
  107 + <h1>
  108 + <a href="#" class='logo'>{{article.title}}</a>
  109 + <div class="top-menu">
  110 + <a href="#/artigo/108073">Sobre</a>
  111 + <a href="#/programas">Programas</a>
  112 + </div>
  113 + </h1>
108 114 <div class="social top">
109 115 {{#social_share "Dialoga Brasil" "Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo" "#"}}{{/social_share}}
110 116 </div>
... ... @@ -121,19 +127,6 @@
121 127 </div>
122 128 </div>
123 129  
124   - <!--
125   - <nav class="tab" role="tabpanel">
126   - <ul role="tablist">
127   - <li id="nav-proposal-categories" role="presentation">
128   - <a href="#/temas" class="active" role="tab" aria-controls="proposal-categories">Por Temas</a>
129   - </li>
130   - <li id="nav-proposal-group" role="presentation">
131   - <a href="#/programas" role="tab" aria-controls="proposal-group">Por Programas</a>
132   - </li>
133   - </ul>
134   - </nav>
135   - -->
136   -
137 130 <div class="background content">
138 131 <div class="container">
139 132 <div class="col-sm-3">
... ...
js/main.js
  Diff comments   View file @c85cfec
... ... @@ -271,6 +271,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
271 271 // this.randomProposalByTheme(['category-saude', 'category-seguranca-publica', 'category-educacao', 'category-reducao-da-pobreza']);
272 272 $('.proposal-item').show(); /* Show all programs */
273 273 $('#proposal-group').show();
  274 + $('#proposal-categories').show();
274 275 $('.proposal-category-items').hide();
275 276 $('#nav-proposal-group a').addClass('active');
276 277 $('#nav-proposal-categories a').removeClass('active');
... ...
sass/style.sass
  Diff comments   View file @c85cfec
... ... @@ -337,7 +337,7 @@ td
337 337 // 6.2 - logo
338 338 h1
339 339 float: left
340   - a
  340 + .logo
341 341 background: url(images/logo.png) no-repeat center
342 342 display: inline-block
343 343 height: 80px
... ...
sass/style.scss
View file @6ffced5
... ... @@ -1,297 +0,0 @@
1   -@import 'utilities/variables';
2   -
3   -@import 'nav';
4   -@import 'header';
5   -@import 'proposal_categories';
6   -@import 'proposal_group';
7   -@import 'proposal_detail';
8   -@import 'login';
9   -@import 'footer';
10   -@import 'accessibility';
11   -@import 'slick';
12   -@import 'slick-theme';
13   -@import 'share';
14   -@import 'article';
15   -
16   -@import 'proposal_detail/proposal-detail-base';
17   -@import 'proposal_detail/urgencia-e-emergencia';
18   -@import 'proposal_detail/mais-medicos';
19   -@import 'proposal_detail/brasil-sem-miseria';
20   -
21   -// Prevent text size change on orientation change.
22   -html {
23   - -webkit-text-size-adjust: 100%;
24   -}
25   -
26   -html, body {
27   - color: #000;
28   - margin: 0;
29   - padding: 0;
30   - height: 100%;
31   - font-family: asap, sans;
32   -}
33   -
34   -h1 {
35   - position: absolute;
36   - bottom: 0;
37   - left: 0;
38   - color: #03316f;
39   - font-size: 28px;
40   - padding: 20px 0;
41   - margin: 0;
42   - display: block;
43   - width: 100%;
44   - text-transform: uppercase;
45   - border-bottom: 1px solid #d6dcd7;
46   - a {
47   - text-decoration: none;
48   - color: #03316f;
49   - }
50   -}
51   -
52   -// #proposal-result {
53   -// width: 90%;
54   -// margin: 0 auto 40px auto;
55   -// }
56   -
57   -#content {
58   - padding-bottom: 50px;
59   - p {
60   - text-align: inherit;
61   - margin: 0;
62   - line-height: inherit;
63   - font-size: inherit;
64   -
65   - font{
66   - weight: lighter;
67   - size: 14px;
68   - }
69   - }
70   -}
71   -
72   -.hide {
73   - display: none;
74   -}
75   -
76   -.mobile nav {
77   - position: absolute;
78   - bottom: 0;
79   -}
80   -
81   -form {
82   - input, div.label, textarea {
83   - // width: 90%;
84   - margin: 0 auto;
85   - font-size: 14px;
86   - display: block;
87   - padding: 5px;
88   - }
89   -
90   - input, textarea {
91   - color: #000;
92   - border: 1px solid #18376C;
93   - width: 100%;
94   - margin-bottom: 20px;
95   - }
96   -
97   - textarea {
98   - margin-bottom: 10px;
99   - }
100   -
101   - a {
102   - font-size: 14px;
103   - font-weight: bold;
104   - color: #000;
105   - font-weight: bold;
106   - text-decoration: none;
107   - // margin: 10px 20px;
108   - }
109   -
110   - .actions, .oauth {
111   - // text-align: center;
112   - // font-size: 12px;
113   - // margin-top: 10px;
114   - }
115   -}
116   -
117   -// TO_REFACT:
118   -.btn {
119   - display: inline-block;
120   - padding: 0 12px;
121   - margin-bottom: 0;
122   - font-size: 14px;
123   - font-weight: 400;
124   - // line-height: 3.1;
125   - text-align: center;
126   - white-space: nowrap;
127   - vertical-align: middle;
128   - -ms-touch-action: manipulation;
129   - touch-action: manipulation;
130   - cursor: pointer;
131   - -webkit-user-select: none;
132   - -moz-user-select: none;
133   - -ms-user-select: none;
134   - user-select: none;
135   - background-image: none;
136   - border: 0;
137   - vertical-align: middle;
138   - /* border-radius: 4px; */
139   -}
140   -
141   -.btn-default {
142   - color: #fff;
143   - background-color: transparent;
144   - border-color: #ccc;
145   -}
146   -
147   -.ui-helper-hidden-accessible{
148   - display: none;
149   -}
150   -
151   -// shame hack for issue #72
152   -@media (max-width: 992px) {
153   - .col-md-6 > img {
154   - margin-bottom: 20px;
155   - }
156   -}
157   -
158   -.captcha{
159   - display: table;
160   - margin: 20px 0;
161   - position: relative;
162   - width: 100%;
163   - z-index: 1;
164   -}
165   -
166   -@media (max-width: 480px) {
167   - header {
168   - height: auto;
169   - h1 {
170   - border-bottom: 0;
171   - padding-bottom: 0;
172   - padding-top: 0;
173   - position: absolute;
174   - margin-bottom: 0;
175   - top: 2em;
176   - z-index: 1;
177   - }
178   - #display-contrast {
179   - display: inline-block;
180   - margin-bottom: 20px;
181   - margin-top: 10px;
182   - position: relative;
183   - top: 0;
184   - }
185   - }
186   - .social {
187   - &.top {
188   - border-bottom: 1px solid #d6dcd7;
189   - float: none;
190   - margin-top: 3.5em;
191   - margin-bottom: 0;
192   - padding: 0 0 20px;
193   - z-index: 2;
194   - }
195   - }
196   - .select {
197   - .proposal-category {
198   - &:after {
199   - content: "";
200   - display: block;
201   - clear: both;
202   - }
203   - }
204   - .proposal-selection {
205   - float: none;
206   - margin: 4px 0 0 !important;
207   - width: auto;
208   - }
209   - }
210   - .proposal-header {
211   - .show_body {
212   - a {
213   - display: block !important;
214   - line-height: 1;
215   - }
216   - span {
217   - display: inline !important;
218   - }
219   - }
220   - .abstract {
221   - p {
222   - padding-bottom: 5px !important;
223   - }
224   - }
225   - }
226   -}
227   -
228   -.footable {
229   - &-loaded {
230   - td {
231   - font-weight: 500 !important;
232   - }
233   - }
234   - &-detail {
235   - &-show {
236   - td {
237   - background-color: #ddd !important;
238   - .footable-toggle {
239   - background-color: #ccc
240   - }
241   - }
242   - }
243   - }
244   - &-row {
245   - &-detail {
246   - &-cell {
247   - border-top: 1px solid #ccc !important;
248   - padding: 0 !important;
249   - }
250   - &-inner {
251   - background-color: #ccc;
252   - display: block;
253   - padding: 10px;
254   - width: 100%;
255   - }
256   - &-row {
257   - display: inline-block;
258   - }
259   - &-row:nth-child(2) {
260   - div:nth-child(1) {
261   - background: url(images/icons/icon-afavor.png) no-repeat center top;
262   - text-indent: -99999px;
263   - }
264   - }
265   - &-row:nth-child(3) {
266   - div:nth-child(1) {
267   - background: url(images/icons/icon-contra.png) no-repeat center top;
268   - text-indent: -99999px;
269   - }
270   - }
271   - &-name {
272   - display: block;
273   - padding: 2px 15px;
274   - text-transform: uppercase;
275   - font-size: 16px;
276   - }
277   - &-value {
278   - display: block;
279   - }
280   - }
281   - }
282   - &.breakpoint {
283   - > tbody {
284   - > tr {
285   - > td {
286   - > span {
287   - &.footable-toggle {
288   - float: right;
289   - margin: -10px;
290   - padding: 12px;
291   - }
292   - }
293   - }
294   - }
295   - }
296   - }
297   -}