Download as
Browse Code »

Commit d7f3a8445e6d923ef2d0f9b8cfc9c9a793b68b1d

Authored by Leonardo Merlin
2 parents 0fb1b562 dabe8ada
Exists in master and in 5 other branches build, build2, contigency_plan_recaptcha, production, staging

Merge branch 'merlin'

Showing 4 changed files with 9 additions and 6 deletions   Show diff stats
images/logo.png
View file @d7f3a84

22.3 KB | W: | H:

23 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -518,7 +518,7 @@ @@ -518,7 +518,7 @@
518 <div class="col-sm-8 col-md-9 col-lg-10"> 518 <div class="col-sm-8 col-md-9 col-lg-10">
519 <div class="row"> 519 <div class="row">
520 <div class="talk__counter"> 520 <div class="talk__counter">
521 - {{#compare total_followers 0 operator=">"}} 521 + {{#compare total_followers 50 operator=">"}}
522 <span class="talk__value">{{total_followers}}</span> 522 <span class="talk__value">{{total_followers}}</span>
523 <span class="talk__counter-message">se inscreveram para esse hangout</span> 523 <span class="talk__counter-message">se inscreveram para esse hangout</span>
524 {{^}} 524 {{^}}
js/handlebars-helpers.js
  Diff comments   View file @d7f3a84
@@ -42,7 +42,7 @@ define([&#39;handlebars&#39;], function(Handlebars){ @@ -42,7 +42,7 @@ define([&#39;handlebars&#39;], function(Handlebars){
42 '<div class="box__image" style="background-image:url(' + (options.hash['host'] + proposal.image.url) + ')"></div>' + 42 '<div class="box__image" style="background-image:url(' + (options.hash['host'] + proposal.image.url) + ')"></div>' +
43 '<div class="box__title">' + proposal.title + '</div>' + 43 '<div class="box__title">' + proposal.title + '</div>' +
44 (proposal.abstract ? '<div class="box__abstract">' + proposal.abstract + '</div>' : '') + 44 (proposal.abstract ? '<div class="box__abstract">' + proposal.abstract + '</div>' : '') +
45 - '<div class="box__footer">' + '<button type="button" class="button button-block participe">OPINE NESTE PROGRAMA</button>' + '</div>' + 45 + '<div class="box__footer">' + '<button type="button" class="button button-block participe">Participe</button>' + '</div>' +
46 '</div>'; 46 '</div>';
47 } 47 }
48 48
sass/style.sass
  Diff comments   View file @d7f3a84
@@ -396,11 +396,14 @@ textarea @@ -396,11 +396,14 @@ textarea
396 h1 396 h1
397 float: left 397 float: left
398 .logo 398 .logo
399 - background: url(images/logo.png) no-repeat center 399 + background-image: url(images/logo.png)
  400 + background-repeat: no-repeat
  401 + background-position: center center
  402 + background-size: contain
  403 + height: 55px
  404 + width: 322px
400 display: inline-block 405 display: inline-block
401 - height: 80px  
402 text-indent: -99999px 406 text-indent: -99999px
403 - width: 180px  
404 407
405 // 6.3 - menu topo 408 // 6.3 - menu topo
406 .top-menu 409 .top-menu
@@ -412,7 +415,7 @@ h1 @@ -412,7 +415,7 @@ h1
412 color: $header-color 415 color: $header-color
413 display: block 416 display: block
414 float: left 417 float: left
415 - margin: ($gutter * 2) ($gutter * 0.5) 0 418 + margin: ($gutter) ($gutter * 0.5) 0
416 text-transform: uppercase 419 text-transform: uppercase
417 @media (max-width: $screen-xs) 420 @media (max-width: $screen-xs)
418 margin: 0 ($gutter) 421 margin: 0 ($gutter)