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

Delta Between Two Patch Sets: static/css/main.css

Issue 29551738: Issue 5634 - Replaced logo and refactored navbar width and colors (Closed) Base URL: https://hg.adblockplus.org/web.adblockplus.org
Left Patch Set: Rebased Created Oct. 6, 2017, 1:23 p.m.
Right Patch Set: Addressed comments Created Oct. 11, 2017, 11:59 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
« no previous file with change/comment | « no previous file | static/css/main-desktop.css » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /*******************************************************************************
2 * Base styles
3 ******************************************************************************/
4 html {
5 color: #212121;
6 background-color: #fff;
7 font-family: sans-serif;
8 line-height: 1.5; }
9
10 /**
11 * Stretch content full-width
12 */
13 .full-width {
14 display: block;
15 width: 100%;
16 margin: 1em 0px; }
17
18 /**
19 * Center content within a (responsive) fixed width
20 */
21 .container {
22 width: auto;
23 max-width: 100%;
24 margin: 0px auto;
25 padding: 0px 1em; }
26
27 @media (min-width: 768px) {
28 .container {
29 width: 720px; } }
30
31 @media (min-width: 1200px) {
32 .container {
33 width: 1170px; } }
34
35 /*******************************************************************************
36 * Grid component
37 ******************************************************************************/
38 /**
39 * - .row contains one or more .column(s)
40 * - .row clears .column(s)
41 * - .row negates the left & right padding of it's left-most & right-most
42 * .column(s) while preserving consistent padding between .column(s)
43 */
44 .row {
45 margin: 0px -1em; }
46
47 .row:after {
48 display: block;
49 clear: both;
50 content: ""; }
51
52 /**
53 * - .column is 100% width by default
54 * - Modifier classes are applied to .column to change it's width
55 * - Modifier classes behave differently on different device widths
56 */
57 .column {
58 position: relative;
59 width: 100%;
60 min-height: 1px;
61 padding: 0px 1em; }
62
63 /* - .column(s) within .row .reverse appear in reverse order
64 * - .column(s) within [dir=rtl] appear in reverse order respectively
65 */
66 .column,
67 [dir="rtl"] .reverse .column {
68 float: left; }
69
70 .row,
71 .column {
72 box-sizing: border-box; }
73
74 .reverse .column,
75 [dir="rtl"] .column {
76 float: right; }
77
78 @media (min-width: 768px) {
79 .one-half,
80 .one-fourth {
81 width: 50%; } }
82
83 @media (min-width: 1200px) {
84 .one-third {
85 width: 33.333333%; }
86 .two-thirds {
87 width: 66.666667%; }
88 .one-fourth {
89 width: 25%; }
90 .three-fourths {
91 width: 75%; } }
92
93 * 1 *
94 >>>>>>> destination 2 {
95 { 3 font-family: Arial, sans;
96 font-family: 'Source Sans Pro', sans-serif;
97 font-size: 16px; 4 font-size: 16px;
98 } 5 }
99 6
100 body 7 body
101 { 8 {
102 margin: 0; 9 margin: 0;
103 line-height: 1.5; 10 line-height: 1.5;
104 } 11 }
105 12
106 a img 13 a img
(...skipping 23 matching lines...) Expand all
130 border: 1px solid black; 37 border: 1px solid black;
131 overflow: auto; 38 overflow: auto;
132 } 39 }
133 40
134 .sprite 41 .sprite
135 { 42 {
136 display: inline-block; 43 display: inline-block;
137 font-size: 0px; /* fix for IE6 height bug */ 44 font-size: 0px; /* fix for IE6 height bug */
138 background-image: url(../img/sprite-main.png); 45 background-image: url(../img/sprite-main.png);
139 background-repeat: no-repeat; 46 background-repeat: no-repeat;
140 }
141
142 nav ul
143 {
144 list-style: none;
145 margin: 0;
146 padding: 0;
147 }
148
149 nav a:link,
150 nav a:visited
151 {
152 color: #7d7d7d;
153 text-decoration: none;
154 }
155
156 nav a:hover
157 {
158 text-decoration: underline;
159 }
160
161 .container
162 {
163 max-width: 1170px;
164 }
165
166 @media (min-width: 1170px)
167 {
168 .container
169 {
170 margin: 0 auto;
171 }
172 }
173
174 #navbar-primary
175 {
176 background-color: #c70d2c;
177 }
178
179 #navbar-logo
180 {
181 padding: 0px 15px;
182 color: #fff;
183 }
184
185 #navbar-logo:hover,
186 #navbar-logo:active,
187 #navbar-logo:focus
188 {
189 background-color: #AE0013;
190 text-decoration: none;
191 }
192
193 #navbar-logo,
194 #navbar-logo > *
195 {
196 display: block;
197 float: left;
198 }
199
200 [dir="rtl"] #navbar-logo,
201 [dir="rtl"] #navbar-logo > *
202 {
203 float: right;
204 }
205
206 #navbar-logo > img
207 {
208 height: 48px;
209 padding: 11px 0px;
210 margin: 0px 15px 0px 0px;
211 }
212
213 [dir="rtl"] #navbar-logo > img
214 {
215 margin: 0px 0px 0px 15px;
216 }
217
218 #navbar-logo > span
219 {
220 line-height: 70px;
221 font-size: 22px;
222 }
223
224 #navbar-nav li
225 {
226 list-style-type: none;
227 }
228
229 #navbar-nav a
230 {
231 color: #fff;
232 text-decoration: none;
233 }
234
235 @media(max-width: 999px)
236 {
237 #navbar-primary
238 {
239 min-height: 70px;
240 }
241
242 #navbar-menu
243 {
244 display: block;
245 }
246
247 #navbar-menu,
248 #navbar-menu > img
249 {
250 float: right;
251 }
252
253 [dir="rtl"] #navbar-menu,
254 [dir="rtl"] #navbar-menu > img
255 {
256 float: left;
257 }
258
259 #navbar-menu > img
260 {
261 display: inline-block;
262 height: 25px;
263 padding: 22.5px 15px;
264 }
265
266 #navbar-menu:hover,
267 #navbar-menu:active,
268 #navbar-menu:focus
269 {
270 background-color: #AE0013;
271 }
272
273 #navbar-nav
274 {
275 display: none;
276 float: left;
277 background-color: #292929;
278 }
279
280 #navbar-nav.visible
281 {
282 display: block;
283 }
284
285 #navbar-nav li,
286 #navbar-nav li a
287 {
288 display: block;
289 }
290
291 #navbar-nav li a
292 {
293 font-size: 20px;
294 line-height: 60px;
295 padding: 0px 20px;
296 }
297
298 #navbar-nav li a:hover,
299 #navbar-nav li a:active,
300 #navbar-nav li a:focus
301 {
302 background-color: #434343;
303 }
304
305 #locales li,
306 #locales a
307 {
308 display: inline-block;
309 }
310
311 #navbar-nav #selected-locale
312 {
313 display: none;
314 }
315 }
316
317 @media(min-width: 1000px)
318 {
319 #navbar-primary
320 {
321 height: 70px;
322 }
323
324 #navbar-nav
325 {
326 float: right;
327 }
328
329 [dir="rtl"] #navbar-nav
330 {
331 float: left;
332 }
333
334 #navbar-nav > li,
335 #navbar-nav > li > a
336 {
337 display: inline-block;
338 }
339
340 #navbar-nav > li > a
341 {
342 padding: 0px 15px;
343 font-size: 18px;
344 line-height: 70px;
345 }
346
347 #navbar-nav > li > a:hover,
348 #navbar-nav > li > a:active,
349 #navbar-nav > li > a:focus
350 {
351 background-color: #AE0013;
352 }
353
354 #locale
355 {
356 position: relative;
357 }
358
359 #locales
360 {
361 position: absolute;
362 display: none;
363 min-width: 160px;
364 max-height: 384px;
365 max-height: 50vh;
366 top: 100%;
367 right: 0px;
368 overflow: auto;
369 z-index: 1000;
370 }
371
372 [dir="rtl"] #locales
373 {
374 right: auto;
375 left: 0px;
376 }
377
378 #locales.visible
379 {
380 display: block;
381 }
382
383 #locales > li,
384 #locales > li > a
385 {
386 display: block;
387 white-space: nowrap;
388 }
389
390 #locales > li > a
391 {
392 padding: 0px 15px;
393 font-size: 16px;
394 line-height: 50px;
395 background-color: #292929;
396 text-decoration: none;
397 }
398
399 #locales > li > a:hover,
400 #locales > li > a:active,
401 #locales > li > a:focus
402 {
403 background-color: #434343;
404 }
405
406 #selected-locale::after
407 {
408 display: inline-block;
409 width: 0;
410 height: 0;
411 margin-left: .255em;
412 vertical-align: .255em;
413 content: "";
414 border-top: .3em solid;
415 border-right: .3em solid transparent;
416 border-left: .3em solid transparent;
417 }
418
419 #navbar-menu
420 {
421 display: none;
422 }
423 }
424
425 #content h1
426 {
427 font-size: 30px;
428 }
429
430 #content h2
431 {
432 font-weight: bold;
433 font-size: 25px;
434 }
435
436 #content h3
437 {
438 font-size: 20px;
439 } 47 }
440 48
441 #adblock-browser-notification 49 #adblock-browser-notification
442 { 50 {
443 text-align: center; 51 text-align: center;
444 } 52 }
445 53
446 #adblock-browser-notification a 54 #adblock-browser-notification a
447 { 55 {
448 font-weight: bold; 56 font-weight: bold;
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 200
593 [dir="ltr"] .alert 201 [dir="ltr"] .alert
594 { 202 {
595 border-left: 5px solid #d14841; 203 border-left: 5px solid #d14841;
596 } 204 }
597 205
598 [dir="rtl"] .alert 206 [dir="rtl"] .alert
599 { 207 {
600 border-right: 5px solid #d14841; 208 border-right: 5px solid #d14841;
601 } 209 }
210
211 /******************************************************************************
212 * .content
213 *****************************************************************************/
214
215 .content h1,
216 .content h2,
217 .content h3,
218 .content h4,
219 .content h5
220 {
221 font-weight: bold;
222 margin: 32px 0px;
223 margin: 2rem 0rem;
224 }
225
226 .content h1 { font-size: 2.4em; }
227 .content h2 { font-size: 1.6em; }
228 .content h3 { font-size: 1.3em; }
229 .content h4 { font-size: 1.2em; }
230 .content h5 { font-size: 1.1em; }
231
232 /*******************************************************************************
233 * #navbar
234 ******************************************************************************/
235
236 #navbar
237 {
238 height: 4em;
239 background-color: #c70d2c;
240 }
241
242 #navbar li
243 {
244 list-style-type: none;
245 }
246
247 /* padding provided by navbar contents */
248 .navbar-container
249 {
250 width: 1170px;
251 margin: 0 auto;
252 }
253
254 /* full-width under .container max-width */
255 @media(max-width: 1199px)
256 {
257 .navbar-container
258 {
259 width: 100%;
260 }
261 }
262
263 /* #navbar #navbar-logo
264 ******************************************************************************/
265
266 #navbar-logo
267 {
268 /* padding is visible in hover background-color change */
269 padding: 0em 1em;
270 color: #fff;
271 }
272
273 #navbar-logo:hover,
274 #navbar-logo:active,
275 #navbar-logo:focus
276 {
277 background-color: #AE0013;
278 text-decoration: none;
279 }
280
281 #navbar-logo,
282 #navbar-logo > *
283 {
284 float: left;
285 }
286
287 [dir="rtl"] #navbar-logo,
288 [dir="rtl"] #navbar-logo > *
289 {
290 float: right;
291 }
292
293 #navbar-logo img
294 {
295 height: 4em;
296 padding: 0.5em 0em;
297 margin: 0em 1em 0em 0em;
298 }
299
300 [dir="rtl"] #navbar-logo > img
301 {
302 margin: 0em 0em 0em 1em;
303 }
304
305 #navbar-logo > span
306 {
307 /* full-height: 2.91 * 1.375 = ~4em */
308 line-height: 2.91em;
309 font-size: 1.375em;
310 }
311
312 /* #navbar #navbar-menu-toggle
313 ******************************************************************************/
314
315 #navbar-menu-toggle
316 {
317 float: right;
318 padding: 1em;
319 }
320
321 [dir="rtl"] #navbar-menu-toggle
322 {
323 float: left;
324 }
325
326 /* show on mobile */
327 #navbar-menu-toggle,
328 #navbar-menu-toggle > img
329 {
330 display: block;
331 }
332
333 /* hide on desktop */
334 @media(min-width: 992px)
335 {
336 #navbar-menu-toggle
337 {
338 display: none;
339 }
340 }
341
342 #navbar-menu-toggle > img
343 {
344 /* plus 2em padding = 4em */
345 height: 2em;
346 }
347
348 #navbar-menu-toggle:hover,
349 #navbar-menu-toggle:active,
350 #navbar-menu-toggle:focus
351 {
352 background-color: #AE0013;
353 }
354
355 /* #navbar #navbar-menu
356 ******************************************************************************/
357
358 #navbar-menu a
359 {
360 display: block;
361 color: #fff;
362 text-decoration: none;
363 }
364
365 /* #navbar #navbar-menu #navbar-locale-menu
366 ******************************************************************************/
367
368 /* caret */
369 #navbar-locale-selected:after
370 {
371 display: inline-block;
372 width: 0;
373 height: 0;
374 margin: 0em 0em 0em 0.255em;
375 vertical-align: .255em;
376 content: "";
377 border-top: .3em solid;
378 border-right: .3em solid transparent;
379 border-left: .3em solid transparent;
380 }
381
382 [dir="rtl"] #navbar-locale-selected:after
383 {
384 margin: 0em 0.255em 0em 0em;
385 }
386
387 #navbar-locale-menu
388 {
389 display: none;
390 }
391
392 #navbar-locale-menu.visible
393 {
394 display: block;
395 }
396
397 #navbar-locale-menu > li > a
398 {
399 padding: 0.75em 1em;
400 }
401
402 #navbar-locale-menu > li > a:hover,
403 #navbar-locale-menu > li > a:active,
404 #navbar-locale-menu > li > a:focus
405 {
406 background-color: #434343;
407 }
408
409 /* #navbar #navbar-menu (desktop)
410 ******************************************************************************/
411
412 @media(min-width: 992px)
413 {
414 #navbar-menu
415 {
416 float: right;
417 }
418
419 [dir="rtl"] #navbar-menu
420 {
421 float: left;
422 }
423
424 #navbar-menu > li,
425 #navbar-menu > li > a
426 {
427 display: inline-block;
428 }
429
430 #navbar-menu > li > a
431 {
432 padding: 0em 1em;
433 line-height: 4em;
434 }
435
436 #navbar-menu > li > a:hover,
437 #navbar-menu > li > a:active,
438 #navbar-menu > li > a:focus
439 {
440 background-color: #AE0013;
441 }
442
443 /* #navbar #navbar-menu #navbar-locale-menu
444 ****************************************************************************/
445
446 #navbar-locale-menubar
447 {
448 position: relative;
449 }
450
451 #navbar-locale-menu
452 {
453 position: absolute;
454 min-width: 16em;
455 max-height: 20em;
456 max-height: 50vh;
457 top: 100%;
458 right: 0px;
459 overflow: auto;
460 z-index: 9001;
461 background-color: #292929;
462 }
463
464 [dir="rtl"] #navbar-locale-menu
465 {
466 right: auto;
467 left: 0px;
468 }
469 }
470
471 /* #navbar #navbar-menu (mobile)
472 ******************************************************************************/
473
474 @media(max-width: 991px)
475 {
476 #navbar-menu
477 {
478 display: none;
479 float: left;
480 clear: both;
481 width: 100%;
482 background-color: #292929;
483 }
484
485 #navbar-menu.visible
486 {
487 display: block;
488 }
489
490 #navbar-menu li a
491 {
492 padding: 0.75em 1em;
493 }
494
495 #navbar-menu li a:hover,
496 #navbar-menu li a:active,
497 #navbar-menu li a:focus
498 {
499 background-color: #434343;
500 }
501 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld