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. 10, 2017, 11:29 a.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 | « no previous file | static/css/main-desktop.css » ('j') | static/css/main-desktop.css » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 * 1 *
2 { 2 {
3 font-family: Arial, sans; 3 font-family: sans-serif;
juliandoucette 2017/10/10 17:35:04 Removed from PatchSet
ire 2017/10/11 08:09:01 Acknowledged.
4 font-size: 16px; 4 font-size: 16px;
5 } 5 }
6 6
7 body 7 body
8 { 8 {
9 margin: 0; 9 margin: 0;
10 line-height: 1.5; 10 line-height: 1.5;
11 } 11 }
12 12
13 a img 13 a img
(...skipping 25 matching lines...) Expand all
39 } 39 }
40 40
41 .sprite 41 .sprite
42 { 42 {
43 display: inline-block; 43 display: inline-block;
44 font-size: 0px; /* fix for IE6 height bug */ 44 font-size: 0px; /* fix for IE6 height bug */
45 background-image: url(../img/sprite-main.png); 45 background-image: url(../img/sprite-main.png);
46 background-repeat: no-repeat; 46 background-repeat: no-repeat;
47 } 47 }
48 48
49 nav ul 49 /*******************************************************************************
50 { 50 * #navbar
juliandoucette 2017/10/10 17:35:08 Moved this below .content
ire 2017/10/11 08:09:03 Acknowledged.
51 list-style: none; 51 ******************************************************************************/
52 margin: 0; 52
53 padding: 0; 53 #navbar
54 } 54 {
juliandoucette 2017/10/10 17:35:06 It's necessary to set height here because overflow
ire 2017/10/11 08:09:04 Acknowledged.
55 55 height: 4em;
56 nav a:link, nav a:visited 56 background-color: #c70d2c;
57 { 57 }
58 color: #7d7d7d; 58
59 #navbar ul
juliandoucette 2017/10/10 17:35:08 This isn't necessary anymore because of website-de
ire 2017/10/11 08:09:03 Acknowledged.
60 {
61 margin: 0em;
62 padding: 0em;
63 }
64
65 #navbar li
juliandoucette 2017/10/10 17:35:05 This isn't necessary anymore because of website-de
ire 2017/10/11 08:09:02 Acknowledged.
66 {
67 list-style-type: none;
68 }
69
70 #navbar .container
juliandoucette 2017/10/10 17:35:08 I'm torn between changing #navbar .container or cr
ire 2017/10/11 08:09:00 I think I prefer creating a new class because it i
juliandoucette 2017/10/11 11:59:34 Agreed. I'll change it.
71 {
72 padding: 0em;
73 }
74
75 @media(max-width: 1199px)
76 {
77 #navbar .container
78 {
79 width: 100%;
80 }
81 }
82
83 /* #navbar #logo
84 ******************************************************************************/
85
86 #logo
87 {
88 padding-left: 1em;
89 padding-right: 1em;
90 color: #fff;
91 }
92
93 #logo:hover,
94 #logo:active,
95 #logo:focus
96 {
97 background-color: #AE0013;
59 text-decoration: none; 98 text-decoration: none;
juliandoucette 2017/10/10 17:35:07 Removed unnecessary text-decoration nullification.
ire 2017/10/11 08:09:00 Acknowledged.
60 } 99 }
61 100
62 nav a:hover 101 #logo,
63 { 102 #logo > *
64 text-decoration: underline;
65 }
66
67 header
68 { 103 {
69 display: block; 104 display: block;
70 position: relative; 105 float: left;
71 background: white; 106 }
72 border: 1px solid #d9d9d9; 107
73 border-top: none; 108 [dir="rtl"] #logo,
74 box-shadow: 1px 1px 0 0 #d9d9d9; 109 [dir="rtl"] #logo > *
75 z-index: 1; 110 {
76 } 111 float: right;
77 112 }
78 header nav li 113
79 { 114 #logo img
80 padding: 0px 5px; 115 {
81 } 116 height: 4em;
82 117 padding-top: 0.5em;
83 header nav li.selected 118 padding-bottom: 0.5em;
84 { 119 margin-right: 1em;
85 color: #db1313; 120 }
86 text-shadow: 1px 1px 1px #eee; 121
87 cursor: default; 122 [dir="rtl"] #logo > img
88 } 123 {
89 124 margin-left: 1em;
90 header nav li.install-link a 125 }
91 { 126
92 color: #048e48; 127 #logo > span
juliandoucette 2017/10/10 17:35:05 IDK if this looks different on different platforms
93 } 128 {
94 129 line-height: 2.91em;
95 header nav li.install-link .install-link-icon 130 font-size: 1.375em;
96 { 131 }
97 display: inline-block; 132
98 width: 12px; 133 /* #navbar #menu-toggle
99 height: 12px; 134 ******************************************************************************/
100 background-position: -167px -13px; 135
101 } 136 #menu-toggle
102 137 {
103 .language-entry a 138 float: right;
139 padding: 1em;
140 }
141
142 [dir="rtl"] #menu-toggle
143 {
144 float: left;
145 }
146
147 /* show on mobile */
148 #menu-toggle,
149 #menu-toggle > img
104 { 150 {
105 display: block; 151 display: block;
106 } 152 }
107 153
108 #logo 154 /* hide on desktop */
109 { 155 @media(min-width: 992px)
110 position: absolute; 156 {
111 width: 128px; 157 #menu-toggle
112 height: 128px; 158 {
113 background-position: -83px -83px; 159 display: none;
160 }
161 }
162
163 #menu-toggle > img
164 {
165 height: 2em;
166 }
167
168 #menu-toggle:hover,
169 #menu-toggle:active,
170 #menu-toggle:focus
171 {
172 background-color: #AE0013;
173 }
174
175 /* #navbar #navbar-menu
176 ******************************************************************************/
177
178 #navbar-menu a
179 {
180 color: #fff;
181 text-decoration: none;
182 }
183
184 /* #navbar #navbar-menu (desktop)
185 ******************************************************************************/
186
187 @media(min-width: 992px)
188 {
189 #navbar-menu
190 {
191 float: right;
192 }
193
194 [dir="rtl"] #navbar-menu
195 {
196 float: left;
197 }
198
199 #navbar-menu > li,
200 #navbar-menu > li > a
201 {
202 display: inline-block;
203 }
204
205 #navbar-menu > li > a
206 {
207 padding-right: 1em;
208 padding-left: 1em;
209 line-height: 4em;
210 }
211
212 #navbar-menu > li > a:hover,
213 #navbar-menu > li > a:active,
214 #navbar-menu > li > a:focus
215 {
216 background-color: #AE0013;
217 }
218
219 /* #navbar #navbar-menu #locale-menu
220 ****************************************************************************/
221
222 #locale-menubar
223 {
224 position: relative;
225 }
226
227 #locale-menu
228 {
229 position: absolute;
230 display: none;
231 min-width: 16em;
232 max-height: 20em;
233 max-height: 50vh;
234 top: 100%;
235 right: 0px;
236 overflow: auto;
237 z-index: 1000;
238 background-color: #292929;
239 }
240
241 [dir="rtl"] #locale-menu
242 {
243 right: auto;
244 left: 0px;
245 }
246
247 #locale-menu.visible
juliandoucette 2017/10/10 17:35:06 Moved this logic above as it now applies to both d
ire 2017/10/11 08:09:00 Acknowledged.
248 {
249 display: block;
250 }
251
252 #locale-menu > li,
253 #locale-menu > li > a
254 {
255 display: block;
256 white-space: nowrap;
257 }
258
259 #locale-menu > li > a
260 {
261 padding-left: 1em;
262 padding-right: 1em;
263 line-height: 3em;
juliandoucette 2017/10/10 17:35:05 Changed to default line-height and padding: 0.75em
ire 2017/10/11 08:09:02 Acknowledged.
264 text-decoration: none;
juliandoucette 2017/10/10 17:35:09 Removed unnecessary text-decoration nullification.
ire 2017/10/11 08:09:01 Acknowledged.
265 }
266
267 #locale-menu > li > a:hover,
268 #locale-menu > li > a:active,
269 #locale-menu > li > a:focus
270 {
271 background-color: #434343;
272 }
273
274 /* caret */
275 #locale-selected::after
juliandoucette 2017/10/10 17:35:05 I think I'll flip this caret on select separately.
ire 2017/10/11 08:09:01 Acknowledged.
276 {
277 display: inline-block;
278 width: 0;
279 height: 0;
280 margin-left: .255em;
281 vertical-align: .255em;
282 content: "";
283 border-top: .3em solid;
284 border-right: .3em solid transparent;
285 border-left: .3em solid transparent;
286 }
287 }
288
289 /* #navbar #navbar-menu (mobile)
290 ******************************************************************************/
291
292 @media(max-width: 991px)
293 {
294 #navbar-menu
295 {
296 display: none;
297 float: left;
298 background-color: #292929;
299 }
300
301 #navbar-menu.visible,
302 #navbar-menu li,
303 #navbar-menu li a
304 {
305 display: block;
306 }
307
308 #navbar-menu li a
309 {
310 line-height: 3em;
311 padding-left: 1em;
312 padding-right: 1em;
313 }
314
315 #navbar-menu li a:hover,
316 #navbar-menu li a:active,
317 #navbar-menu li a:focus
318 {
319 background-color: #434343;
320 }
321
322 /* locales appear inline in mobile menu */
323 #locale-menu li,
324 #locale-menu a
325 {
326 display: inline-block;
327 }
328
329 /* selected locale does not appear in mobile menu */
330 #navbar-menu #locale-selected
331 {
332 display: none;
333 }
114 } 334 }
115 335
116 #adblock-browser-notification 336 #adblock-browser-notification
117 { 337 {
118 text-align: center; 338 text-align: center;
119 } 339 }
120 340
121 #adblock-browser-notification a 341 #adblock-browser-notification a
122 { 342 {
123 font-weight: bold; 343 font-weight: bold;
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 font-weight: bold; 508 font-weight: bold;
289 margin: 32px 0px; 509 margin: 32px 0px;
290 margin: 2rem 0rem; 510 margin: 2rem 0rem;
291 } 511 }
292 512
293 .content h1 { font-size: 2.4em; } 513 .content h1 { font-size: 2.4em; }
294 .content h2 { font-size: 1.6em; } 514 .content h2 { font-size: 1.6em; }
295 .content h3 { font-size: 1.3em; } 515 .content h3 { font-size: 1.3em; }
296 .content h4 { font-size: 1.2em; } 516 .content h4 { font-size: 1.2em; }
297 .content h5 { font-size: 1.1em; } 517 .content h5 { font-size: 1.1em; }
OLDNEW
« no previous file with comments | « no previous file | static/css/main-desktop.css » ('j') | static/css/main-desktop.css » ('J')

Powered by Google App Engine
This is Rietveld