Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: static/scss/content/_typography.scss

Issue 29438582: Issue 5135 - Reduce font size and padding on smaller screens on acceptableads.com (Closed) Base URL: https://hg.adblockplus.org/web.acceptableads.com
Left Patch Set: Created May 16, 2017, 4:26 a.m.
Right Patch Set: Fix alignment of hr under headings Created July 6, 2017, 10:25 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
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 13 matching lines...) Expand all
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 33
34 @media screen and (max-width: $tablet-breakpoint) 34 @media (max-width: $tablet-breakpoint)
35 { 35 {
36 font-size: $font-size-h1 - 10px; 36 font-size: $font-size-h1 - 12px;
37 margin: $md 0 $lg 0; 37 margin-top: $md;
juliandoucette 2017/05/30 14:22:57 NIT: It would be more straightforward if you just
ire 2017/05/30 17:44:59 Acknowledged.
38 }
39 @media (max-width: $mobile-breakpoint)
40 {
41 font-size: $font-size-h1 - 16px;
42 margin-bottom: $lg - 20px;
38 } 43 }
39 } 44 }
40 45
41 h2, 46 h2,
42 .h2 47 .h2
43 { 48 {
44 margin: $lg 0 $md 0; 49 margin: $lg 0 $md 0;
45 font-size: $font-size-h2; 50 font-size: $font-size-h2;
46 font-weight: 700; 51 font-weight: 700;
47 52
48 @media screen and (max-width: $tablet-breakpoint) 53 @media (max-width: $tablet-breakpoint)
49 { 54 {
50 margin: $md 0 $md 0; 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;
51 } 62 }
52 } 63 }
53 64
54 h3, 65 h3,
55 .h3 66 .h3
56 { 67 {
57 margin: $lg 0 $md 0; 68 margin: $lg 0 $md 0;
58 font-size: $font-size-h3; 69 font-size: $font-size-h3;
59 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 }
60 } 81 }
61 82
62 h4, 83 h4,
63 .h4 84 .h4
64 { 85 {
65 margin: $md 0 $sm 0; 86 margin: $md 0 $sm 0;
66 font-size: $font-size-h4; 87 font-size: $font-size-h4;
67 font-weight: 700; 88 font-weight: 700;
89
90 @media (max-width: $mobile-breakpoint)
91 {
92 font-size: $font-size-h4 - 2px;
93 }
68 } 94 }
69 95
70 h5, 96 h5,
71 .h5 97 .h5
72 { 98 {
73 margin: $sm 0; 99 margin: $sm 0;
74 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 }
75 } 106 }
76 107
77 h6, 108 h6,
78 .h6 109 .h6
79 { 110 {
80 margin: $sm 0; 111 margin: $sm 0;
81 font-size: $font-size-h6; 112 font-size: $font-size-h6;
82 font-weight: 400; 113 font-weight: 400;
114
115 @media (max-width: $mobile-breakpoint)
116 {
117 font-size: $font-size-h6 - 2px;
118 }
83 } 119 }
84 120
85 // Main text /////////////////////////////////////////////////////////////////// 121 // Main text ///////////////////////////////////////////////////////////////////
86 122
87 html, 123 html,
88 body 124 body
89 { 125 {
90 color: $primary-fg; 126 color: $primary-fg;
91 // @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/
92 font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, 128 font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont,
93 "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", 129 "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
94 "Fira Sans", "Droid Sans", "Helvetica Neue", 130 "Fira Sans", "Droid Sans", "Helvetica Neue",
95 sans-serif; 131 sans-serif;
96 font-size: $font-size-lg; 132 font-size: $font-size-lg;
97 font-weight: 300; 133 font-weight: 300;
98 line-height: 120%; 134 line-height: 120%;
135
136 @media (max-width: $mobile-breakpoint)
137 {
138 font-size: $font-size-lg - 2px;
139 }
99 } 140 }
100 141
101 small, 142 small,
102 .small 143 .small
103 { 144 {
104 margin-bottom: $xs; 145 margin-bottom: $xs;
105 font-size: 70%; 146 font-size: 70%;
106 line-height: 80%; 147 line-height: 80%;
107 } 148 }
108 149
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 dd 304 dd
264 { 305 {
265 margin: $sm 0 $md 0; 306 margin: $sm 0 $md 0;
266 } 307 }
267 308
268 dt 309 dt
269 { 310 {
270 font-size: $font-size-xl; 311 font-size: $font-size-xl;
271 text-transform: uppercase; 312 text-transform: uppercase;
272 font-weight: 700; 313 font-weight: 700;
314
315 @media (max-width: $tablet-breakpoint)
316 {
317 font-size: $font-size-xl - 2px;
318 }
273 } 319 }
274 320
275 // Blockquotes ///////////////////////////////////////////////////////////////// 321 // Blockquotes /////////////////////////////////////////////////////////////////
276 322
277 blockquote 323 blockquote
278 { 324 {
279 margin: 0; 325 margin: 0;
280 padding: 0 $md; 326 padding: 0 $md;
281 text-transform: uppercase; 327 text-transform: uppercase;
282 font-size: $font-size-lg; 328 font-size: $font-size-lg;
(...skipping 16 matching lines...) Expand all
299 border: none; 345 border: none;
300 } 346 }
301 347
302 .center blockquote 348 .center blockquote
303 { 349 {
304 @extend h2; 350 @extend h2;
305 margin: 0; 351 margin: 0;
306 padding: $lg 0; 352 padding: $lg 0;
307 font-style: normal; 353 font-style: normal;
308 354
309 @media screen and (max-width: $tablet-breakpoint) 355 @media (max-width: $tablet-breakpoint)
310 { 356 {
311 font-size: $font-size-h3; 357 font-size: $font-size-h3;
312 padding: $md 0; 358 padding: $md 0;
313 } 359 }
314 } 360 }
315 361
316 .center blockquote p:last-child 362 .center blockquote p:last-child
317 { 363 {
318 margin-top: -$xs; 364 margin-top: -$xs;
319 } 365 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 // hr background color is the line color 425 // hr background color is the line color
380 background-color: $primary-fg; 426 background-color: $primary-fg;
381 } 427 }
382 428
383 // Place hr under h1 or h2 inside hN margin 429 // Place hr under h1 or h2 inside hN margin
384 h1 + hr, 430 h1 + hr,
385 h2 + hr 431 h2 + hr
386 { 432 {
387 position: absolute; 433 position: absolute;
388 margin: -$md 0 $md 0; 434 margin: -$md 0 $md 0;
435
436 @media (max-width: $mobile-breakpoint)
437 {
438 margin-top: -$sm - 5px;
ire 2017/07/06 10:31:38 The $xs size was every so slightly off
439 }
389 } 440 }
390 441
391 // center hr in centered blocks 442 // center hr in centered blocks
392 .center hr 443 .center hr
393 { 444 {
394 margin: $sm auto; 445 margin: $sm auto;
395 } 446 }
396 447
397 // Tables ////////////////////////////////////////////////////////////////////// 448 // Tables //////////////////////////////////////////////////////////////////////
398 449
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 { 483 {
433 vertical-align: bottom; 484 vertical-align: bottom;
434 text-transform: uppercase; 485 text-transform: uppercase;
435 border-bottom: 2px solid $info; 486 border-bottom: 2px solid $info;
436 } 487 }
437 488
438 table tbody + tbody 489 table tbody + tbody
439 { 490 {
440 border-top: 2px solid $info; 491 border-top: 2px solid $info;
441 } 492 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld