Left: | ||
Right: |
OLD | NEW |
---|---|
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus 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 |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
13 * | 13 * |
14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
16 */ | 16 */ |
17 | 17 |
18 @font-face { | 18 @font-face { |
19 font-family: "CreteRound"; | 19 font-family: 'Source Sans Pro'; |
20 font-style: normal; | 20 font-style: normal; |
21 src: url(fonts/CreteRound-Regular.otf); | 21 font-weight: 300; |
22 font-stretch: normal; | |
22 src: local ("Ø"), | 23 src: local ("Ø"), |
juliandoucette
2017/10/08 13:18:12
NIT: What the?
martin
2017/10/16 09:09:09
My reaction exactly. It was like this in the origi
saroyanm
2017/10/16 10:22:59
It's used to force not using local font, I think t
| |
23 /*local ("Ø") forces using no local font called CreteRound*/ | 24 url(fonts/SourceSansPro-Light.woff) format("otf"); |
24 url(fonts/CreteRound-Regular.otf) format("otf"); | |
25 } | 25 } |
26 | 26 |
27 @font-face { | 27 @font-face { |
28 font-family: "CreteRound"; | 28 font-family: 'Source Sans Pro'; |
29 font-style: italic; | 29 font-style: normal; |
30 src: url(fonts/CreteRound-Italic.otf); | 30 font-weight: 400; |
31 font-stretch: normal; | |
31 src: local ("Ø"), | 32 src: local ("Ø"), |
32 /*local ("Ø") forces using no local font called CreteRound*/ | 33 url(fonts/SourceSansPro-Regular.woff) format("woff"); |
33 url(fonts/CreteRound-Italic.otf) format("otf"); | 34 } |
34 } | 35 |
35 | 36 @font-face { |
36 body | 37 font-family: 'Source Sans Pro'; |
37 { | 38 font-style: normal; |
38 font-family: Helvetica, Arial, sans-serif; | 39 font-weight: 700; |
39 font-size: 15px; | 40 font-stretch: normal; |
40 line-height: 140%; | 41 src: local ("Ø"), |
41 color: #7f776b; | 42 url(fonts/SourceSansPro-bold.woff) format("woff"); |
42 background-color: #f8f6f2; | 43 } |
43 background-image: url(background-main.png); | 44 |
45 | |
46 body { | |
47 font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif; | |
48 font-size: 16px; | |
juliandoucette
2017/10/08 13:18:11
NIT: I prefer to set document wide styles on the r
martin
2017/10/16 14:36:00
Done.
| |
49 background-color: white; | |
juliandoucette
2017/10/08 13:18:11
NIT/Reminder: "CSS color values should be specifie
martin
2017/10/16 09:09:09
Done.
| |
44 margin: 0; | 50 margin: 0; |
45 padding: 0; | 51 padding: 0; |
46 } | 52 } |
47 | 53 |
48 a, a:link, a:visited | 54 .container { |
49 { | 55 width: 100%; |
50 color: #5a84b3; | 56 max-width: 100%; |
57 margin: 0px auto; | |
58 padding: 0px 1em; | |
59 } | |
60 | |
61 header { | |
juliandoucette
2017/10/08 13:18:11
NOTE: Padding inside the .content body causes this
| |
62 text-align: center; | |
63 background: #f9f9f9; | |
64 padding: 4em 0; | |
65 margin-bottom: 4em; | |
66 } | |
67 | |
68 @media (min-width: 768px) { | |
69 .container { | |
70 width: 720px; | |
71 } | |
72 } | |
73 | |
74 @media (min-width: 992px) { | |
juliandoucette
2017/10/08 13:18:11
NIT: This doesn't make sense.
- You are setting a
| |
75 .container { | |
76 width: 1200px; | |
77 } | |
78 } | |
79 | |
80 @media (max-width: 1194px) { | |
81 .container { | |
82 width: 80%; | |
83 text-align: center; | |
84 } | |
85 } | |
86 | |
87 @media (max-width: 474px) { | |
88 .container { | |
89 width: 100%; | |
juliandoucette
2017/10/08 13:18:11
NIT: This kills the padding left/right because htm
| |
90 } | |
91 } | |
92 | |
93 .button-primary { | |
juliandoucette
2017/10/08 13:18:11
NIT/Suggest: Make this button full-width on small
| |
94 display: inline-block; | |
95 text-decoration: none; | |
96 text-transform: uppercase; | |
97 color: white !important; | |
juliandoucette
2017/10/08 13:18:11
NIT: This important is unnecessary?
| |
98 text-align: center; | |
99 width: 100%; | |
100 border-radius: 6px; | |
101 height: 54px; | |
juliandoucette
2017/10/08 13:18:12
NIT: px [height, width, line-height] kinda defeats
martin
2017/10/16 14:36:00
Done.
| |
102 line-height: 54px; | |
103 background: #C70D2C; | |
104 } | |
105 | |
106 @media (max-width: 1194px) { | |
107 .button-primary { | |
108 width: 50%; | |
juliandoucette
2017/10/08 13:18:11
NIT: This gets pretty awkward around 336px.
| |
109 } | |
110 } | |
111 | |
112 .store-buttons { | |
113 height: 54px; | |
114 width: 100%; | |
115 } | |
116 | |
117 .store-button { | |
118 display: block; | |
119 height: 54px; | |
120 width: 180px; | |
121 } | |
122 | |
123 .applestore-button { | |
124 background: url("./icons/first-run/appstore-bg.svg"); | |
125 float: left; | |
126 margin-right: 1em; | |
127 } | |
128 | |
129 .googleplay-button { | |
130 background: url("./icons/first-run/googleplay-bg.svg"); | |
131 float: left; | |
132 } | |
133 | |
134 @media (max-width: 1194px) { | |
135 .store-buttons { | |
136 text-align: center; | |
137 } | |
138 .store-button { | |
139 display: inline-block; | |
juliandoucette
2017/10/08 13:18:11
NIT: These buttons are not horizontally aligned on
| |
140 float: none; | |
141 } | |
142 } | |
143 | |
144 @media (max-width: 1207px) { | |
145 .applestore-button { | |
146 margin-right: .5em; | |
147 } | |
148 } | |
149 | |
150 h1 { | |
juliandoucette
2017/10/08 13:18:11
NIT: This doesn't fit on the screen ~320 Firefox
| |
151 font-size: 3em; | |
152 margin: 0; | |
153 } | |
154 | |
155 h2 { | |
156 font-size: 2em; | |
157 } | |
158 | |
159 p { | |
160 margin: 0 0 1em 0; | |
161 font-size: 1.25em; | |
juliandoucette
2017/10/08 13:18:12
NIT: I see that you followed Paul's stytleguide ~e
| |
162 font-weight: 300; | |
juliandoucette
2017/10/08 13:18:11
NIT: We agreed (privately - sorry) to use 400 inst
| |
163 line-height: 150%; | |
164 } | |
165 | |
166 p > a { | |
167 color: #C70D2C; | |
168 text-decoration: none; | |
169 font-size: 1em; | |
juliandoucette
2017/10/08 13:18:12
NIT: This doesn't actually do anything because em
| |
170 font-weight: 400; | |
171 } | |
172 | |
173 p > a:hover { | |
51 text-decoration: underline; | 174 text-decoration: underline; |
52 } | 175 } |
53 | 176 |
54 a:hover | 177 /******************************************************************************* |
55 { | 178 * Grid component |
juliandoucette
2017/10/08 13:18:11
Now that I think about it, you could include all o
| |
56 text-decoration: none; | 179 ******************************************************************************/ |
57 } | 180 /** |
58 | 181 * - .row contains one or more .column(s) |
59 button | 182 * - .row clears .column(s) |
60 { | 183 * - .row negates the left & right padding of it's left-most & right-most |
61 cursor: pointer; | 184 * .column(s) while preserving consistent padding between .column(s) |
62 } | 185 */ |
63 | 186 .row { |
64 ul | 187 margin: 0px -1em; } |
65 { | 188 |
66 margin: 0; | 189 .row:after { |
67 padding: 0; | 190 display: block; |
68 } | 191 clear: both; |
69 | 192 content: ""; } |
70 li | 193 |
71 { | 194 /** |
72 margin: 0; | 195 * - .column is 100% width by default |
73 padding: 0; | 196 * - Modifier classes are applied to .column to change it's width |
74 list-style-type: none; | 197 * - Modifier classes behave differently on different device widths |
75 } | 198 */ |
76 | 199 .column { |
77 header | 200 position: relative; |
78 { | 201 width: 100%; |
79 background-image: url(background.png); | 202 min-height: 1px; |
80 background-repeat: repeat-x; | 203 padding: 1em; |
81 width: 100%; | |
82 padding-top: 25px; | |
83 } | |
84 | |
85 header h1 | |
86 { | |
87 font-size: 24px; | |
88 font-weight: normal; | |
89 color: #57ab5b; | |
90 text-align: center; | |
91 margin: 21px auto; | |
92 padding: 16px 0px; | |
93 border: 1px #57ab5b; | |
94 border-style: dashed none; | |
95 /* border parallel fix - 957px is the value | |
96 * closest to 960px(page width) which makes | |
97 * the dashed border parallel | |
98 */ | |
99 max-width: 957px; | |
100 } | |
101 | |
102 h1, | |
103 h2, | |
104 h3 | |
105 { | |
106 font-family: CreteRound, Helvetica, Arial, sans-serif; | |
107 } | |
108 | |
109 h2 | |
110 { | |
111 font-size: 26px; | |
112 font-weight: lighter; | |
113 color: #968d81; | |
114 line-height: 28px; | |
115 text-align: center; | |
116 margin: 0; | |
117 padding: 0; | |
118 } | |
119 | |
120 h3 | |
121 { | |
122 font-size: 22px; | |
123 color: #7F776B; | |
124 font-weight: normal; | |
125 margin-top: 0px; | |
126 margin-bottom: 10px; | |
127 padding: 0; | |
128 line-height: 24px; | |
129 } | |
130 | |
131 h4 | |
132 { | |
133 font-size: 15px; | |
134 color: #7f776b; | |
135 font-weight: normal; | |
136 text-align: center; | |
137 margin: 0; | |
138 padding: 0; | |
139 } | |
140 | |
141 section | |
142 { | |
143 margin: 0 auto; | |
144 margin-bottom: 30px; | |
145 max-width: 960px; | |
146 background-image: url(background.png); | |
147 padding: 40px 100px; | |
148 box-sizing: border-box; | 204 box-sizing: border-box; |
149 } | 205 } |
150 | 206 |
151 #general | 207 /* - .column(s) within .row .reverse appear in reverse order |
152 { | 208 * - .column(s) within [dir=rtl] appear in reverse order respectively |
153 display: table; | 209 */ |
154 padding-left: 0px; | 210 .column, |
155 padding-right: 0px; | 211 [dir="rtl"] .reverse .column { |
156 } | 212 float: left; } |
157 | 213 |
158 #general > .block | 214 .reverse .column, |
159 { | 215 [dir="rtl"] .column { |
160 display: table-cell; | 216 float: right; } |
161 width: 50%; | 217 |
162 vertical-align: top; | 218 @media (min-width: 768px) { |
163 padding: 0px 50px; | 219 .one-half, |
164 border: dashed 0 #969085; | 220 .one-fourth { |
165 -webkit-border-start-width: 1px; | 221 width: 50%; } } |
166 -moz-border-start-width: 1px; | 222 |
167 border-inline-start-width: 1px; | 223 @media (min-width: 992px) { |
168 } | 224 .one-third { |
169 | 225 width: 33.333333%; } |
170 #general > .block:first-child | 226 .two-thirds { |
171 { | 227 width: 66.666667%; } } |
172 border: none; | 228 |
173 } | 229 @media (min-width: 992px) { |
174 | 230 .one-fourth { |
175 #acceptable-ads-block h2 | 231 width: 25%; } |
176 { | 232 .three-fourths { |
177 margin-bottom: 34px; | 233 width: 75%; } } |
178 } | 234 |
179 | 235 @media (max-width: 1194px) { |
180 #abb-promotion-block:lang(fr) | 236 .one-third { |
181 { | 237 width: 100%; |
182 display: none; | 238 } |
183 } | 239 } |
184 | 240 |
185 #abb-promotion-block | 241 @media (max-width: 1194px) { |
186 { | 242 .column { |
187 text-align: center; | 243 padding: 4em 0; |
188 } | 244 border-bottom: 1px solid lightgrey; |
189 | 245 } |
190 #abb-promotion-block h2 | 246 } |
191 { | 247 |
192 color: #7795b6; | 248 |
193 margin-bottom: 40px; | 249 |
194 } | |
195 | |
196 #abb-promotion-block a | |
197 { | |
198 border: solid 1px #446a96; | |
199 border-radius: 5px; | |
200 display: inline-block; | |
201 padding: 6px 16px; | |
202 background: -webkit-linear-gradient(bottom, #294e76, #6b92be); | |
203 background: linear-gradient(to top, #294e76, #6b92be); | |
204 text-decoration: none; | |
205 text-align: start; | |
206 } | |
207 | |
208 #abb-promotion-block a > div | |
209 { | |
210 display: table-cell; | |
211 vertical-align: middle; | |
212 padding: 6px; | |
213 } | |
214 | |
215 #abb-promotion-block .title | |
216 { | |
217 font-size: 21px; | |
218 color: #ffffff; | |
219 font-weight: bold; | |
220 } | |
221 | |
222 #abb-promotion-block .subtitle | |
223 { | |
224 font-size: 12px; | |
225 color: #9ab7d6; | |
226 } | |
227 | |
228 #abb-promotion-block a:hover | |
229 { | |
230 box-shadow: 0px 0px 5px #5D5D5D; | |
231 } | |
232 | |
233 #abb-promotion-block a:active | |
234 { | |
235 box-shadow: 0px 0px 5px 1px #5D5D5D; | |
236 } | |
237 | |
238 section > p | |
239 { | |
240 margin-top: 15px; | |
241 } | |
242 | |
243 #logo | |
244 { | |
245 margin: 0 auto; | |
246 height: 128px; | |
247 width: 128px; | |
248 display: block; | |
249 } | |
250 | |
251 #share | |
252 { | |
253 background-image: url(background-share.png); | |
254 text-align: center; | |
255 font-family: CreteRound, Helvetica, Arial, sans-serif; | |
256 } | |
257 | |
258 #share h2 | |
259 { | |
260 margin-bottom: 30px; | |
261 } | |
262 | |
263 #share h2, | |
264 #share h2 > a | |
265 { | |
266 color: #fff; | |
267 } | |
268 | |
269 #share h2 > a:hover | |
270 { | |
271 color: #2e5075; | |
272 } | |
273 | |
274 #share span | |
275 { | |
276 color: #bed1e6; | |
277 text-align: center; | |
278 line-height: 34px; | |
279 font-size: 22px; | |
280 display: block; | |
281 } | |
282 | |
283 #donate:hover, .share-buttons a:hover | |
284 { | |
285 box-shadow: 0px 0px 0px 2px #8ca7c4; | |
286 border-radius: 30px; | |
287 } | |
288 | |
289 #share > .block | |
290 { | |
291 display: inline-block; | |
292 vertical-align: top; | |
293 width: 49%; | |
294 padding: 5px 0px; | |
295 border: 1px dashed #37506d; | |
296 border-style: none dashed; | |
297 } | |
298 | |
299 #share > .block:last-child | |
300 { | |
301 -webkit-border-start-style: none; | |
302 -moz-border-start-style: none; | |
303 } | |
304 | |
305 #share > .block > span | |
306 { | |
307 margin: 10px 20px; | |
308 } | |
309 | |
310 .share-buttons | |
311 { | |
312 margin-top: 6px; | |
313 vertical-align: top; | |
314 /* because inline block creates | |
315 * space if not captured with | |
316 * font-size and line-height 0px | |
317 */ | |
318 font-size: 0px; | |
319 line-height: 0px; | |
320 } | |
321 | |
322 .share-buttons > a | |
323 { | |
324 width: 50px; | |
325 height: 50px; | |
326 margin: 0 8px; | |
327 text-decoration: none; | |
328 display: inline-block; | |
329 } | |
330 | |
331 #share-general, | |
332 #share-chinese:lang(zh) | |
333 { | |
334 display: block; | |
335 } | |
336 | |
337 #share-general:lang(zh), | |
338 #share-chinese | |
339 { | |
340 display: none; | |
341 } | |
342 | |
343 #share-chinese > a | |
344 { | |
345 border-bottom: 2px solid transparent; | |
346 } | |
347 | |
348 #share-chinese > a:hover | |
349 { | |
350 box-shadow: none; | |
351 border-radius: 0; | |
352 border-bottom: 2px solid #8CA7C4; | |
353 } | |
354 | |
355 #share-facebook | |
356 { | |
357 background-image: url(social/facebook.png); | |
358 background-repeat: no-repeat; | |
359 } | |
360 | |
361 #share-twitter | |
362 { | |
363 background-image: url(social/twitter.png); | |
364 background-repeat: no-repeat; | |
365 } | |
366 | |
367 #share-gplus | |
368 { | |
369 background-image: url(social/googleplus.png); | |
370 background-repeat: no-repeat; | |
371 } | |
372 | |
373 #share-renren | |
374 { | |
375 background-image: url(social/renren.png); | |
376 background-repeat: no-repeat; | |
377 } | |
378 | |
379 #share-weibo | |
380 { | |
381 background-image: url(social/weibo.png); | |
382 background-repeat: no-repeat; | |
383 } | |
384 | |
385 .warning | |
386 { | |
387 font-size: 160%; | |
388 border: 3px dashed red; | |
389 text-align: center; | |
390 line-height: 1.3em; | |
391 } | |
392 | |
393 #social ul | |
394 { | |
395 list-style: none; | |
396 display: inline-block; | |
397 padding: 0; | |
398 margin: 0; | |
399 } | |
400 | |
401 #social:hover h1 | |
402 { | |
403 opacity: 0; | |
404 } | |
405 | |
406 #social ul:hover li { | |
407 opacity: 0.3; | |
408 } | |
409 | |
410 #social ul li | |
411 { | |
412 display: inline-block; | |
413 margin: 0px 5px; | |
414 -webkit-transition: opacity .5s ease, bottom .3s ease; | |
415 transition: opacity .5s ease, bottom .3s ease; | |
416 position: relative; | |
417 bottom: -30px; | |
418 } | |
419 | |
420 #social ul li:hover | |
421 { | |
422 opacity: 1.0; | |
423 bottom: 0px; | |
424 } | |
425 | |
426 .share-button | |
427 { | |
428 display: inline-block; | |
429 width: 82px; | |
430 height: 82px; | |
431 } | |
432 | |
433 /* Change order of the blocks for French */ | |
434 #content:lang(fr) | |
435 { | |
436 display: table; | |
437 margin: auto; | |
438 caption-side: bottom; | |
439 } | |
440 | |
441 #share:lang(fr) | |
442 { | |
443 display: table-caption; | |
444 } | |
445 | |
446 #donate | |
447 { | |
448 height: 21px; | |
449 display: inline-block; | |
450 margin-top: 15px; | |
451 margin-bottom: 2px; | |
452 font-size: 16px; | |
453 color: #003366; | |
454 cursor: pointer; | |
455 font-weight: bold; | |
456 padding: 5px 18px; | |
457 text-decoration: none; | |
458 border-radius: 20px; | |
459 border: 1px solid #FF9933; | |
460 overflow: hidden; | |
461 font-family: arial, sans-serif; | |
462 background-image: url(donate.png); | |
463 background-repeat: repeat-x; | |
464 } | |
465 | |
466 footer | |
467 { | |
468 margin: 0 auto 30px; | |
469 max-width: 960px; | |
470 text-align: center; | |
471 } | |
472 | |
473 @media (max-width: 970px) | |
474 { | |
475 header | |
476 { | |
477 background-size: 100px 57px; | |
478 } | |
479 | |
480 #logo | |
481 { | |
482 width: 64px; | |
483 height: 64px; | |
484 } | |
485 | |
486 section | |
487 { | |
488 padding: 40px 20px; | |
489 } | |
490 | |
491 #general, | |
492 #general > .block, | |
493 #share > .block | |
494 { | |
495 display: block; | |
496 } | |
497 | |
498 #general > .block | |
499 { | |
500 width: auto; | |
501 margin-left: 20px; | |
502 margin-right: 20px; | |
503 padding: 10px 0px; | |
504 border-width: 1px 0px 0px; | |
505 } | |
506 | |
507 #share > .block | |
508 { | |
509 width: auto; | |
510 padding: 20px 0px; | |
511 border-style: dashed none none; | |
512 } | |
513 | |
514 #donate, | |
515 .share-buttons | |
516 { | |
517 margin-top: 10px; | |
518 } | |
519 } | |
OLD | NEW |