Download as
Browse Code »

Commit 31e863ca79b3c646a8e890cbcbd99e8a4f631ddf

Authored by Leonardo Merlin
2 parents 5a59dc46 9e7585e6
Exists in master and in 5 other branches build, build2, contigency_plan_recaptcha, production, staging

Merge branch 'issue-301'

Showing 4 changed files with 66 additions and 32 deletions   Show diff stats
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 <header class="container"> 99 <header class="container">
100 <div class="row" style="margin: 10px 0 0 0"> 100 <div class="row" style="margin: 10px 0 0 0">
101 <div class="col-xs-5"> 101 <div class="col-xs-5">
102 - <a id="display-contrast" href="#">Alto Contraste</a> 102 + <button type="button" id="display-contrast" class="btn btn-link"><i class="fa fa-adjust"></i> Alto Contraste</button>
103 </div> 103 </div>
104 <div class="col-xs-7"> 104 <div class="col-xs-7">
105 <div class="participar"> 105 <div class="participar">
@@ -313,35 +313,54 @@ @@ -313,35 +313,54 @@
313 <div class="talk-proposal-container col-sm-12"> 313 <div class="talk-proposal-container col-sm-12">
314 <section class="talk-proposal box box-propostas"> 314 <section class="talk-proposal box box-propostas">
315 <div class="container-title box-title">Bate-papo com ministras e ministros</div> 315 <div class="container-title box-title">Bate-papo com ministras e ministros</div>
316 - <p>Confira as datas e horários:</p>  
317 - <ul class="calendar saude" data-slick='{"infinite": false, "rows": 2}'>  
318 - <li>  
319 - <span id='ep0'></span>  
320 - <span>Saúde</span>  
321 - <div id='ed0' class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>  
322 - </li>  
323 - </ul>  
324 - <ul class="calendar seguranca-publica" data-slick='{"infinite": false, "rows": 2}'>  
325 - <li>  
326 - <span id='ep1'></span>  
327 - <span id='ed1'>Justiça</span>  
328 - <div class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>  
329 - </li>  
330 - </ul>  
331 - <ul class="calendar educacao" data-slick='{"infinite": false, "rows": 2}'>  
332 - <li>  
333 - <span id='ep2'></span>  
334 - <span>Educação</span>  
335 - <div id='ed2' class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>  
336 - </li>  
337 - </ul>  
338 - <ul class="calendar reducao-da-pobreza" data-slick='{"infinite": false, "rows": 2}'>  
339 - <li>  
340 - <span id='ep3'></span>  
341 - <span>Desenvolvimento Social</span>  
342 - <div id='ed3' class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>  
343 - </li>  
344 - </ul> 316 + <p class="talk__description">Confira as datas e horários:</p>
  317 + <div>
  318 + <ul class="calendar saude" data-slick='{"infinite": false, "rows": 2}'>
  319 + <li>
  320 + <span id='ep0'></span>
  321 + <span>Saúde</span>
  322 + <div id='ed0' class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
  323 + </li>
  324 + </ul>
  325 + <ul class="calendar seguranca-publica" data-slick='{"infinite": false, "rows": 2}'>
  326 + <li>
  327 + <span id='ep1'></span>
  328 + <span id='ed1'>Justiça</span>
  329 + <div class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
  330 + </li>
  331 + </ul>
  332 + <ul class="calendar educacao" data-slick='{"infinite": false, "rows": 2}'>
  333 + <li>
  334 + <span id='ep2'></span>
  335 + <span>Educação</span>
  336 + <div id='ed2' class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
  337 + </li>
  338 + </ul>
  339 + <ul class="calendar reducao-da-pobreza" data-slick='{"infinite": false, "rows": 2}'>
  340 + <li>
  341 + <span id='ep3'></span>
  342 + <span>Desenvolvimento Social</span>
  343 + <div id='ed3' class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
  344 + </li>
  345 + </ul>
  346 + </div>
  347 + <div class="talk__participate">
  348 + <div class="row">
  349 + <div class="col-sm-4 col-md-3 col-lg-2">
  350 + <div class="row">
  351 + <button type="button" class="button button-block">Participar</button>
  352 + </div>
  353 + </div>
  354 + <div class="col-sm-8 col-md-9 col-lg-10">
  355 + <div class="row">
  356 + <div class="talk__counter">
  357 + <span class="talk__value">8.117</span>
  358 + <span class="talk__counter-message">se inscreveram para esse hangout</span>
  359 + </div>
  360 + </div>
  361 + </div>
  362 + </div>
  363 + </div>
345 </section> 364 </section>
346 </div> 365 </div>
347 </div> 366 </div>
1 define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], function($, Handlebars, FastClick){ 1 define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], function($, Handlebars, FastClick){
2 - 2 +
3 /* global Handlebars, $ */ 3 /* global Handlebars, $ */
4 // The template code 4 // The template code
5 var templateSource = $('#proposal-template').html(); 5 var templateSource = $('#proposal-template').html();
1 -define(function(){ 1 +define(['piwik'], function(){
2 var _paq = _paq || []; 2 var _paq = _paq || [];
3 _paq.push(["trackPageView"]); 3 _paq.push(["trackPageView"]);
4 _paq.push(["enableLinkTracking"]); 4 _paq.push(["enableLinkTracking"]);
@@ -10,4 +10,7 @@ define(function(){ @@ -10,4 +10,7 @@ define(function(){
10 var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript"; 10 var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
11 g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s); 11 g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
12 })(); 12 })();
  13 +
  14 + window._paq = _paq;
  15 + return _paq;
13 }); 16 });
14 \ No newline at end of file 17 \ No newline at end of file
sass/style.sass
  Diff comments   View file @31e863c
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
37 // 6.17 - calendario dos ministros 37 // 6.17 - calendario dos ministros
38 // 6.18 - listas 38 // 6.18 - listas
39 // 6.19 - artigo 39 // 6.19 - artigo
  40 +// 6.20 - participe
40 // 7 - Modificadores 41 // 7 - Modificadores
41 // 8 - Cores do Temas 42 // 8 - Cores do Temas
42 // 9 - Alto Contraste 43 // 9 - Alto Contraste
@@ -220,6 +221,8 @@ textarea @@ -220,6 +221,8 @@ textarea
220 display: inline-block 221 display: inline-block
221 padding-bottom: $gutter * 0.25 !important 222 padding-bottom: $gutter * 0.25 !important
222 padding-top: $gutter * 0.25 !important 223 padding-top: $gutter * 0.25 !important
  224 + &-block
  225 + width: 100%
223 &-cancela 226 &-cancela
224 @extend .button 227 @extend .button
225 &-send 228 &-send
@@ -252,6 +255,11 @@ textarea @@ -252,6 +255,11 @@ textarea
252 padding-top: 0 255 padding-top: 0
253 vertical-align: middle 256 vertical-align: middle
254 257
  258 +#display-contrast
  259 + color: $link-color
  260 + font-weight: normal
  261 + .contrast &
  262 + color: white
255 // 5.3 - icones 263 // 5.3 - icones
256 .icon 264 .icon
257 background-repeat: no-repeat 265 background-repeat: no-repeat
@@ -1080,6 +1088,10 @@ td @@ -1080,6 +1088,10 @@ td
1080 z-index: 100 1088 z-index: 100
1081 text-align: center 1089 text-align: center
1082 1090
  1091 +// 6.20 - participe
  1092 +// .talk__participate
  1093 +// .talk__participate
  1094 +
1083 // ------------------------------------ 1095 // ------------------------------------
1084 // 7 - Modificadores 1096 // 7 - Modificadores
1085 // ------------------------------------ 1097 // ------------------------------------