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

Side by Side Diff: 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
Patch Set: Rebased Created Oct. 6, 2017, 1:23 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « static/css/index-mobile.css ('k') | static/css/main-desktop.css » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /******************************************************************************* 1 /*******************************************************************************
2 * Base styles 2 * Base styles
3 ******************************************************************************/ 3 ******************************************************************************/
4 html { 4 html {
5 color: #212121; 5 color: #212121;
6 background-color: #fff; 6 background-color: #fff;
7 font-family: sans-serif; 7 font-family: sans-serif;
8 line-height: 1.5; } 8 line-height: 1.5; }
9 9
10 /** 10 /**
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 .one-third { 84 .one-third {
85 width: 33.333333%; } 85 width: 33.333333%; }
86 .two-thirds { 86 .two-thirds {
87 width: 66.666667%; } 87 width: 66.666667%; }
88 .one-fourth { 88 .one-fourth {
89 width: 25%; } 89 width: 25%; }
90 .three-fourths { 90 .three-fourths {
91 width: 75%; } } 91 width: 75%; } }
92 92
93 * 93 *
94 >>>>>>> destination
94 { 95 {
95 font-family: Arial, sans; 96 font-family: 'Source Sans Pro', sans-serif;
96 font-size: 16px; 97 font-size: 16px;
97 } 98 }
98 99
99 body 100 body
100 { 101 {
101 margin: 0; 102 margin: 0;
102 line-height: 1.5; 103 line-height: 1.5;
103 } 104 }
104 105
105 a img 106 a img
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 background-repeat: no-repeat; 139 background-repeat: no-repeat;
139 } 140 }
140 141
141 nav ul 142 nav ul
142 { 143 {
143 list-style: none; 144 list-style: none;
144 margin: 0; 145 margin: 0;
145 padding: 0; 146 padding: 0;
146 } 147 }
147 148
148 nav a:link, nav a:visited 149 nav a:link,
150 nav a:visited
149 { 151 {
150 color: #7d7d7d; 152 color: #7d7d7d;
151 text-decoration: none; 153 text-decoration: none;
152 } 154 }
153 155
154 nav a:hover 156 nav a:hover
155 { 157 {
156 text-decoration: underline; 158 text-decoration: underline;
157 } 159 }
158 160
159 header 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 > *
160 { 195 {
161 display: block; 196 display: block;
162 position: relative; 197 float: left;
163 background: white; 198 }
164 border: 1px solid #d9d9d9; 199
165 border-top: none; 200 [dir="rtl"] #navbar-logo,
166 box-shadow: 1px 1px 0 0 #d9d9d9; 201 [dir="rtl"] #navbar-logo > *
167 z-index: 1; 202 {
168 } 203 float: right;
169 204 }
170 header nav li 205
171 { 206 #navbar-logo > img
172 padding: 0px 5px; 207 {
173 } 208 height: 48px;
174 209 padding: 11px 0px;
175 header nav li.selected 210 margin: 0px 15px 0px 0px;
176 { 211 }
177 color: #db1313; 212
178 text-shadow: 1px 1px 1px #eee; 213 [dir="rtl"] #navbar-logo > img
179 cursor: default; 214 {
180 } 215 margin: 0px 0px 0px 15px;
181 216 }
182 header nav li.install-link a 217
183 { 218 #navbar-logo > span
184 color: #048e48; 219 {
185 } 220 line-height: 70px;
186 221 font-size: 22px;
187 header nav li.install-link .install-link-icon 222 }
188 { 223
189 display: inline-block; 224 #navbar-nav li
190 width: 12px; 225 {
191 height: 12px; 226 list-style-type: none;
192 background-position: -167px -13px; 227 }
193 } 228
194 229 #navbar-nav a
195 .language-entry a 230 {
196 { 231 color: #fff;
197 display: block; 232 text-decoration: none;
198 } 233 }
199 234
200 #logo 235 @media(max-width: 999px)
201 { 236 {
202 position: absolute; 237 #navbar-primary
203 width: 128px; 238 {
204 height: 128px; 239 min-height: 70px;
205 background-position: -83px -83px; 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 }
206 } 423 }
207 424
208 #content h1 425 #content h1
209 { 426 {
210 font-size: 30px; 427 font-size: 30px;
211 } 428 }
212 429
213 #content h2 430 #content h2
214 { 431 {
215 font-weight: bold; 432 font-weight: bold;
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 592
376 [dir="ltr"] .alert 593 [dir="ltr"] .alert
377 { 594 {
378 border-left: 5px solid #d14841; 595 border-left: 5px solid #d14841;
379 } 596 }
380 597
381 [dir="rtl"] .alert 598 [dir="rtl"] .alert
382 { 599 {
383 border-right: 5px solid #d14841; 600 border-right: 5px solid #d14841;
384 } 601 }
OLDNEW
« no previous file with comments | « static/css/index-mobile.css ('k') | static/css/main-desktop.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld