Download as
Browse Code »

Commit cf0b5c6d3be87f204d07616652b98281788dfd5a

Authored by Leonardo Merlin
2 parents 05a27cb6 c337b283
Exists in master and in 10 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, staging

Merge remote-tracking branch 'upstream/master'

Showing 2 changed files with 21 additions and 1 deletions   Show diff stats
Gemfile
  Diff comments   View file @cf0b5c6
1 1 source 'https://rubygems.org'
2   -gem 'sass', '3.4.9'
  2 +gem 'sass', '~> 3.4.9'
3 3 \ No newline at end of file
... ...
sass/proposal_detail/_proposal-detail-base.scss
  Diff comments   View file @cf0b5c6
... ... @@ -3,6 +3,9 @@
3 3 font-family: 'Open Sans', sans-serif;
4 4 font-size: 16px;
5 5 font-weight: 300;
  6 + .proposal-detail-base a {
  7 + color: $color;
  8 + }
6 9 .bloco-destaque {
7 10 background-color: $color;
8 11 }
... ... @@ -29,12 +32,21 @@
29 32 font-size: 28px;
30 33 font-weight: 300;
31 34 text-transform: uppercase;
  35 + .border {
  36 + border-bottom: 1px solid #eeeff1;
  37 + padding-bottom: 20px;
  38 + }
32 39 }
33 40 h4 {
34 41 font-size: 24px;
35 42 color: $color;
36 43 text-transform: none;
37 44 }
  45 + h5 {
  46 + color: $color;
  47 + font-size: 22px;
  48 + margin-top: 15px;
  49 + }
38 50 img {
39 51 &.pull-left {
40 52 margin-right: 20px;
... ... @@ -104,5 +116,13 @@
104 116 .row {
105 117 margin-bottom: 1.5em;
106 118 }
  119 +
  120 + .list-container-border {
  121 + -webkit-border-radius: 3px;
  122 + -moz-border-radius: 3px;
  123 + border-radius: 3px;
  124 + border: 3px solid $color;
  125 + padding: 0 20px;
  126 + }
107 127 }
108 128 }
... ...