Download as
Browse Code »

Commit 43a3e54a06d92f4813591b887591b40f7afaf649

Authored by Leonardo Merlin
2 parents 3b946930 8820112c
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'rafael' into merlin

Showing 1 changed file with 28 additions and 17 deletions   Show diff stats
src/app/layout.scss
  Diff comments   View file @43a3e54
... ... @@ -9,6 +9,7 @@
9 9 display: table-cell;
10 10 float: none;
11 11 height: 100%;
  12 + background-color: #181e21;
12 13 }
13 14  
14 15 .col-top {
... ... @@ -124,12 +125,19 @@
124 125 }
125 126  
126 127 .vertical-padding {
127   - padding-top: 15px;
128   - padding-bottom: 15px;
  128 + padding-top: 15px;
  129 + padding-bottom: 15px;
129 130 }
130 131  
131   -.no-space-left { margin-left: 0; padding-left: 0;}
132   -.no-space-right { margin-right: 0; padding-right: 0;}
  132 +.no-space-left {
  133 + margin-left: 0;
  134 + padding-left: 0;
  135 +}
  136 +
  137 +.no-space-right {
  138 + margin-right: 0;
  139 + padding-right: 0;
  140 +}
133 141  
134 142 .text-center-sm {
135 143 @media screen and (max-width: $screen-sm) {
... ... @@ -141,9 +149,10 @@
141 149 background-color: $defaultblue;
142 150 color: #fff;
143 151 font-weight: bold;
144   -
145 152 &:hover,
146   - &:focus {color: #fff;}
  153 + &:focus {
  154 + color: #fff;
  155 + }
147 156 }
148 157  
149 158 .has-error {
... ... @@ -152,8 +161,8 @@
152 161 }
153 162  
154 163 // Está com o nome do termos de uso. Deixas genérico ou apenas aqui? Ver como vão ficar esses modais
155   -.modal-termos-uso{
156   - &-header{
  164 +.modal-termos-uso {
  165 + &-header {
157 166 border-bottom: none;
158 167 padding: 0px;
159 168 min-height: 10px;
... ... @@ -163,12 +172,10 @@
163 172 top: -30px;
164 173 right: 0px;
165 174 }
166   -
167 175 &-body {
168 176 padding: 25px 35px;
169 177 height: 500px;
170   -
171   - &-inner{
  178 + &-inner {
172 179 background-color: lightgray;
173 180 overflow-y: auto;
174 181 padding: 15px;
... ... @@ -204,8 +211,8 @@ ul.list-color {
204 211 }
205 212  
206 213 ul.list-color li:before {
207   -
208   - @each $category, $color in $categories {
  214 + @each $category,
  215 + $color in $categories {
209 216 .#{$category} & {
210 217 color: $color;
211 218 }
... ... @@ -218,11 +225,12 @@ ul.list-color li:before {
218 225 font-size: 20px;
219 226 position: relative;
220 227 top: 2px;
  228 + color: #2a9677;
221 229 }
222 230  
223   -ul.list-color li {
  231 +ul li {
224 232 padding-left: 2em;
225   - padding-bottom: 10px;
  233 + padding-bottom: 15px;
226 234 text-indent: -0.7em;
227 235 }
228 236  
... ... @@ -262,7 +270,9 @@ ul.list-color li {
262 270 .left-border-gray {
263 271 border-left: 4px solid #d1d6d9;
264 272 margin-bottom: 10px;
265   - ul.list-color li:last-child { padding-bottom: 0; }
  273 + ul.list-color li:last-child {
  274 + padding-bottom: 0;
  275 + }
266 276 @media (max-width: 768px) {
267 277 border: none;
268 278 }
... ... @@ -324,7 +334,8 @@ blockquote {
324 334 }
325 335  
326 336 .top-border-theme {
327   - @each $category, $color in $categories {
  337 + @each $category,
  338 + $color in $categories {
328 339 .#{$category} & {
329 340 border-color: $color;
330 341 }
... ...