Left: | ||
Right: |
OLD | NEW |
---|---|
1 // This file is part of acceptableads.org. | 1 // This file is part of acceptableads.org. |
2 // Copyright (C) 2016 Eyeo GmbH | 2 // Copyright (C) 2016 Eyeo GmbH |
3 // | 3 // |
4 // acceptableads.org is free software: you can redistribute it and/or modify | 4 // acceptableads.org is free software: you can redistribute it and/or modify |
5 // it under the terms of the GNU General Public License as published by | 5 // it under the terms of the GNU General Public License as published by |
6 // the Free Software Foundation, either version 3 of the License, or | 6 // the Free Software Foundation, either version 3 of the License, or |
7 // (at your option) any later version. | 7 // (at your option) any later version. |
8 // | 8 // |
9 // acceptableads.org is distributed in the hope that it will be useful, | 9 // acceptableads.org is distributed in the hope that it will be useful, |
10 // but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 // but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 12 matching lines...) Expand all Loading... | |
23 line-height: 120%; | 23 line-height: 120%; |
24 } | 24 } |
25 | 25 |
26 h1, | 26 h1, |
27 .h1 | 27 .h1 |
28 { | 28 { |
29 margin: $xl 0 $lg 0; | 29 margin: $xl 0 $lg 0; |
30 text-transform: none; | 30 text-transform: none; |
31 font-size: $font-size-h1; | 31 font-size: $font-size-h1; |
32 font-weight: 300; | 32 font-weight: 300; |
33 | |
34 @media (max-width: $tablet-breakpoint) | |
juliandoucette
2017/06/16 18:47:53
NIT: Regarding all $font-size-N - N calculations:
ire
2017/06/19 11:51:04
In some cases, it would work to use a smaller font
juliandoucette
2017/06/20 16:38:36
I prefer the later actually. I think it's more con
ire
2017/06/22 15:41:44
Okay, I'll leave it as it is then.
| |
35 { | |
36 font-size: $font-size-h1 - 12px; | |
37 margin-top: $md; | |
38 } | |
39 @media (max-width: $mobile-breakpoint) | |
40 { | |
41 font-size: $font-size-h1 - 16px; | |
42 margin-bottom: $lg - 20px; | |
43 } | |
33 } | 44 } |
34 | 45 |
35 h2, | 46 h2, |
36 .h2 | 47 .h2 |
37 { | 48 { |
38 margin: $lg 0 $md 0; | 49 margin: $lg 0 $md 0; |
39 font-size: $font-size-h2; | 50 font-size: $font-size-h2; |
40 font-weight: 700; | 51 font-weight: 700; |
52 | |
53 @media (max-width: $tablet-breakpoint) | |
54 { | |
55 font-size: $font-size-h2 - 4px; | |
56 margin-top: $md; | |
57 } | |
58 @media (max-width: $mobile-breakpoint) | |
59 { | |
60 font-size: $font-size-h2 - 6px; | |
61 margin-bottom: $sm; | |
62 } | |
41 } | 63 } |
42 | 64 |
43 h3, | 65 h3, |
44 .h3 | 66 .h3 |
45 { | 67 { |
46 margin: $lg 0 $md 0; | 68 margin: $lg 0 $md 0; |
47 font-size: $font-size-h3; | 69 font-size: $font-size-h3; |
48 font-weight: 700; | 70 font-weight: 700; |
71 | |
72 @media (max-width: $tablet-breakpoint) | |
73 { | |
74 font-size: $font-size-h3 - 2px; | |
75 margin-top: $md; | |
76 } | |
77 @media (max-width: $mobile-breakpoint) | |
78 { | |
79 margin-bottom: $sm; | |
80 } | |
49 } | 81 } |
50 | 82 |
51 h4, | 83 h4, |
52 .h4 | 84 .h4 |
53 { | 85 { |
54 margin: $md 0 $sm 0; | 86 margin: $md 0 $sm 0; |
55 font-size: $font-size-h4; | 87 font-size: $font-size-h4; |
56 font-weight: 700; | 88 font-weight: 700; |
89 | |
90 @media (max-width: $mobile-breakpoint) | |
91 { | |
92 font-size: $font-size-h4 - 2px; | |
93 } | |
57 } | 94 } |
58 | 95 |
59 h5, | 96 h5, |
60 .h5 | 97 .h5 |
61 { | 98 { |
62 margin: $sm 0; | 99 margin: $sm 0; |
63 font-size: $font-size-h5; | 100 font-size: $font-size-h5; |
101 | |
102 @media (max-width: $mobile-breakpoint) | |
103 { | |
104 font-size: $font-size-h5 - 2px; | |
105 } | |
64 } | 106 } |
65 | 107 |
66 h6, | 108 h6, |
67 .h6 | 109 .h6 |
68 { | 110 { |
69 margin: $sm 0; | 111 margin: $sm 0; |
70 font-size: $font-size-h6; | 112 font-size: $font-size-h6; |
71 font-weight: 400; | 113 font-weight: 400; |
114 | |
115 @media (max-width: $mobile-breakpoint) | |
116 { | |
117 font-size: $font-size-h6 - 2px; | |
118 } | |
72 } | 119 } |
73 | 120 |
74 // Main text /////////////////////////////////////////////////////////////////// | 121 // Main text /////////////////////////////////////////////////////////////////// |
75 | 122 |
76 html, | 123 html, |
77 body | 124 body |
78 { | 125 { |
79 color: $primary-fg; | 126 color: $primary-fg; |
80 // @see https://www.smashingmagazine.com/2015/11/using-system-ui-fonts-practic al-guide/ | 127 // @see https://www.smashingmagazine.com/2015/11/using-system-ui-fonts-practic al-guide/ |
81 font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, | 128 font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, |
82 "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", | 129 "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", |
83 "Fira Sans", "Droid Sans", "Helvetica Neue", | 130 "Fira Sans", "Droid Sans", "Helvetica Neue", |
84 sans-serif; | 131 sans-serif; |
85 font-size: $font-size-lg; | 132 font-size: $font-size-lg; |
86 font-weight: 300; | 133 font-weight: 300; |
87 line-height: 120%; | 134 line-height: 120%; |
135 | |
136 @media (max-width: $mobile-breakpoint) | |
137 { | |
138 font-size: $font-size-lg - 2px; | |
139 } | |
88 } | 140 } |
89 | 141 |
90 small, | 142 small, |
91 .small | 143 .small |
92 { | 144 { |
93 margin-bottom: $xs; | 145 margin-bottom: $xs; |
94 font-size: 70%; | 146 font-size: 70%; |
95 line-height: 80%; | 147 line-height: 80%; |
96 } | 148 } |
97 | 149 |
98 blockquote, | 150 blockquote, |
99 p, | 151 p, |
100 ul, | 152 ul, |
101 ol, | 153 ol, |
102 dl, | 154 dl, |
103 .block | 155 .block |
104 { | 156 { |
105 margin: $sm 0; | 157 margin: $sm 0; |
106 } | 158 } |
107 | 159 |
160 .row p:first-child | |
161 { | |
162 margin-top: 0; | |
ire
2017/06/15 11:16:23
I had to override this because it was adding extra
juliandoucette
2017/06/16 18:47:53
You should change components/_columns.scss instead
ire
2017/06/19 11:51:04
Acknowledged.
| |
163 } | |
164 | |
108 // Links /////////////////////////////////////////////////////////////////////// | 165 // Links /////////////////////////////////////////////////////////////////////// |
109 | 166 |
110 a | 167 a |
111 { | 168 { |
112 cursor: pointer; | 169 cursor: pointer; |
113 text-decoration: underline; | 170 text-decoration: underline; |
114 color: $accent; | 171 color: $accent; |
115 font-weight: 400; | 172 font-weight: 400; |
116 } | 173 } |
117 | 174 |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
252 dd | 309 dd |
253 { | 310 { |
254 margin: $sm 0 $md 0; | 311 margin: $sm 0 $md 0; |
255 } | 312 } |
256 | 313 |
257 dt | 314 dt |
258 { | 315 { |
259 font-size: $font-size-xl; | 316 font-size: $font-size-xl; |
260 text-transform: uppercase; | 317 text-transform: uppercase; |
261 font-weight: 700; | 318 font-weight: 700; |
319 | |
320 @media (max-width: $tablet-breakpoint) | |
321 { | |
322 font-size: $font-size-xl - 2px; | |
323 } | |
262 } | 324 } |
263 | 325 |
264 // Blockquotes ///////////////////////////////////////////////////////////////// | 326 // Blockquotes ///////////////////////////////////////////////////////////////// |
265 | 327 |
266 blockquote | 328 blockquote |
267 { | 329 { |
268 margin: 0; | 330 margin: 0; |
269 padding: 0 $md; | 331 padding: 0 $md; |
270 text-transform: uppercase; | 332 text-transform: uppercase; |
271 font-size: $font-size-lg; | 333 font-size: $font-size-lg; |
(...skipping 13 matching lines...) Expand all Loading... | |
285 | 347 |
286 html .center blockquote | 348 html .center blockquote |
287 { | 349 { |
288 border: none; | 350 border: none; |
289 } | 351 } |
290 | 352 |
291 .center blockquote | 353 .center blockquote |
292 { | 354 { |
293 @extend h2; | 355 @extend h2; |
294 margin: 0; | 356 margin: 0; |
295 padding: $xl 0; | 357 padding: $lg 0; |
296 font-style: normal; | 358 font-style: normal; |
359 | |
360 @media (max-width: $tablet-breakpoint) | |
361 { | |
362 font-size: $font-size-h3; | |
363 padding: $md 0; | |
364 } | |
297 } | 365 } |
298 | 366 |
299 .center blockquote p:last-child | 367 .center blockquote p:last-child |
300 { | 368 { |
301 margin-top: -$xs; | 369 margin-top: -$xs; |
302 } | 370 } |
303 | 371 |
304 cite | 372 cite |
305 { | 373 { |
306 font-size: $font-size-sm; | 374 font-size: $font-size-sm; |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
415 { | 483 { |
416 vertical-align: bottom; | 484 vertical-align: bottom; |
417 text-transform: uppercase; | 485 text-transform: uppercase; |
418 border-bottom: 2px solid $info; | 486 border-bottom: 2px solid $info; |
419 } | 487 } |
420 | 488 |
421 table tbody + tbody | 489 table tbody + tbody |
422 { | 490 { |
423 border-top: 2px solid $info; | 491 border-top: 2px solid $info; |
424 } | 492 } |
OLD | NEW |