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: Remove @media screen, Resize h2, Keep icon size Created May 31, 2017, 9:53 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 18 matching lines...) Expand all
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 (max-width: $tablet-breakpoint) 34 @media (max-width: $tablet-breakpoint)
35 { 35 {
36 font-size: $font-size-h1 - 12px; 36 font-size: $font-size-h1 - 12px;
37 margin-top: $md; 37 margin-top: $md;
38 } 38 }
39 @media (max-width: $mobile-breakpoint)
40 {
41 font-size: $font-size-h1 - 16px;
42 margin-bottom: $lg - 20px;
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 (max-width: $tablet-breakpoint) 53 @media (max-width: $tablet-breakpoint)
49 { 54 {
55 font-size: $font-size-h2 - 4px;
56 margin-top: $md;
57 }
58 @media (max-width: $mobile-breakpoint)
59 {
50 font-size: $font-size-h2 - 6px; 60 font-size: $font-size-h2 - 6px;
51 margin-top: $md; 61 margin-bottom: $sm;
52 } 62 }
53 } 63 }
54 64
55 h3, 65 h3,
56 .h3 66 .h3
57 { 67 {
58 margin: $lg 0 $md 0; 68 margin: $lg 0 $md 0;
59 font-size: $font-size-h3; 69 font-size: $font-size-h3;
60 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 }
61 } 81 }
62 82
63 h4, 83 h4,
64 .h4 84 .h4
65 { 85 {
66 margin: $md 0 $sm 0; 86 margin: $md 0 $sm 0;
67 font-size: $font-size-h4; 87 font-size: $font-size-h4;
68 font-weight: 700; 88 font-weight: 700;
89
90 @media (max-width: $mobile-breakpoint)
91 {
92 font-size: $font-size-h4 - 2px;
93 }
69 } 94 }
70 95
71 h5, 96 h5,
72 .h5 97 .h5
73 { 98 {
74 margin: $sm 0; 99 margin: $sm 0;
75 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 }
76 } 106 }
77 107
78 h6, 108 h6,
79 .h6 109 .h6
80 { 110 {
81 margin: $sm 0; 111 margin: $sm 0;
82 font-size: $font-size-h6; 112 font-size: $font-size-h6;
83 font-weight: 400; 113 font-weight: 400;
114
115 @media (max-width: $mobile-breakpoint)
116 {
117 font-size: $font-size-h6 - 2px;
118 }
84 } 119 }
85 120
86 // Main text /////////////////////////////////////////////////////////////////// 121 // Main text ///////////////////////////////////////////////////////////////////
87 122
88 html, 123 html,
89 body 124 body
90 { 125 {
91 color: $primary-fg; 126 color: $primary-fg;
92 // @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/
93 font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, 128 font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont,
94 "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", 129 "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
95 "Fira Sans", "Droid Sans", "Helvetica Neue", 130 "Fira Sans", "Droid Sans", "Helvetica Neue",
96 sans-serif; 131 sans-serif;
97 font-size: $font-size-lg; 132 font-size: $font-size-lg;
98 font-weight: 300; 133 font-weight: 300;
99 line-height: 120%; 134 line-height: 120%;
135
136 @media (max-width: $mobile-breakpoint)
137 {
138 font-size: $font-size-lg - 2px;
139 }
100 } 140 }
101 141
102 small, 142 small,
103 .small 143 .small
104 { 144 {
105 margin-bottom: $xs; 145 margin-bottom: $xs;
106 font-size: 70%; 146 font-size: 70%;
107 line-height: 80%; 147 line-height: 80%;
108 } 148 }
109 149
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 dd 304 dd
265 { 305 {
266 margin: $sm 0 $md 0; 306 margin: $sm 0 $md 0;
267 } 307 }
268 308
269 dt 309 dt
270 { 310 {
271 font-size: $font-size-xl; 311 font-size: $font-size-xl;
272 text-transform: uppercase; 312 text-transform: uppercase;
273 font-weight: 700; 313 font-weight: 700;
314
315 @media (max-width: $tablet-breakpoint)
316 {
317 font-size: $font-size-xl - 2px;
318 }
274 } 319 }
275 320
276 // Blockquotes ///////////////////////////////////////////////////////////////// 321 // Blockquotes /////////////////////////////////////////////////////////////////
277 322
278 blockquote 323 blockquote
279 { 324 {
280 margin: 0; 325 margin: 0;
281 padding: 0 $md; 326 padding: 0 $md;
282 text-transform: uppercase; 327 text-transform: uppercase;
283 font-size: $font-size-lg; 328 font-size: $font-size-lg;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 // hr background color is the line color 425 // hr background color is the line color
381 background-color: $primary-fg; 426 background-color: $primary-fg;
382 } 427 }
383 428
384 // Place hr under h1 or h2 inside hN margin 429 // Place hr under h1 or h2 inside hN margin
385 h1 + hr, 430 h1 + hr,
386 h2 + hr 431 h2 + hr
387 { 432 {
388 position: absolute; 433 position: absolute;
389 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 }
390 } 440 }
391 441
392 // center hr in centered blocks 442 // center hr in centered blocks
393 .center hr 443 .center hr
394 { 444 {
395 margin: $sm auto; 445 margin: $sm auto;
396 } 446 }
397 447
398 // Tables ////////////////////////////////////////////////////////////////////// 448 // Tables //////////////////////////////////////////////////////////////////////
399 449
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 { 483 {
434 vertical-align: bottom; 484 vertical-align: bottom;
435 text-transform: uppercase; 485 text-transform: uppercase;
436 border-bottom: 2px solid $info; 486 border-bottom: 2px solid $info;
437 } 487 }
438 488
439 table tbody + tbody 489 table tbody + tbody
440 { 490 {
441 border-top: 2px solid $info; 491 border-top: 2px solid $info;
442 } 492 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld