OLD | NEW |
---|---|
1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 * Use of this source code is governed by a BSD-style license that can be | 2 * Use of this source code is governed by a BSD-style license that can be |
3 * found in the LICENSE file. | 3 * found in the LICENSE file. |
4 * | 4 * |
5 * This is the stylesheet used by the Out of the box experience (OOBE) flow, | 5 * This is the stylesheet used by the Out of the box experience (OOBE) flow, |
6 * sign in and lock screens. | 6 * sign in and lock screens. |
7 */ | 7 */ |
8 | 8 |
9 html, | 9 html, |
10 body { | 10 body { |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
74 | 74 |
75 html[oobe=old] #oobe { | 75 html[oobe=old] #oobe { |
76 margin-top: 20px; /* Compensate bottom header to center content. */ | 76 margin-top: 20px; /* Compensate bottom header to center content. */ |
77 } | 77 } |
78 | 78 |
79 html[oobe=new] #oobe { | 79 html[oobe=new] #oobe { |
80 margin-top: 40px; /* Compensate bottom header to center content. */ | 80 margin-top: 40px; /* Compensate bottom header to center content. */ |
81 } | 81 } |
82 | 82 |
83 #inner-container { | 83 #inner-container { |
84 /* Height/width of each step is set manually, | |
85 see DisplayManager.toggleStep_() */ | |
86 height: 294px; | |
Nikita (slow)
2012/08/10 08:43:21
Could you please move this to [oobe=old] #inner-co
| |
87 position: relative; | 84 position: relative; |
88 width: 640px; | |
89 } | 85 } |
90 | 86 |
91 html[oobe=old] #inner-container { | 87 html[oobe=old] #inner-container { |
92 padding: 20px; | 88 padding: 20px; |
93 } | 89 } |
94 | 90 |
95 html[oobe=new] #inner-container { | 91 html[oobe=new] #inner-container { |
92 -webkit-transform: perspective(500px); | |
Nikita (slow)
2012/08/10 08:43:21
What do we need this for?
Ivan Korotkov
2012/08/10 10:12:41
Hm, we dont', actually. We need for an outer conta
| |
93 background: -webkit-linear-gradient(rgba(255,255,255,0.99), | |
94 rgba(255,255,255,0.95)); | |
95 border-radius: 2px; | |
96 box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), | |
97 0 4px 23px 5px rgba(0, 0, 0, 0.2), | |
98 0 2px 6px rgba(0, 0, 0, 0.15); | |
99 overflow: hidden; | |
96 padding: 0; | 100 padding: 0; |
97 } | 101 } |
98 | 102 |
99 #security-info a, | 103 #security-info a, |
100 #security-tpm a, | 104 #security-tpm a, |
101 #eula a { | 105 #eula a { |
102 color: rgb(0, 102, 104); | 106 color: rgb(0, 102, 104); |
103 text-decoration: none; | 107 text-decoration: none; |
104 } | 108 } |
105 | 109 |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
195 } | 199 } |
196 | 200 |
197 html[dir=rtl] .header-section.right { | 201 html[dir=rtl] .header-section.right { |
198 right: 50px; | 202 right: 50px; |
199 } | 203 } |
200 | 204 |
201 html[dir=rtl] .header-section.left { | 205 html[dir=rtl] .header-section.left { |
202 right: -20px; | 206 right: -20px; |
203 } | 207 } |
204 | 208 |
205 html[oobe=old] .step-logo { | 209 html[oobe=old] #step-logo { |
206 display: none; | 210 display: none; |
207 } | 211 } |
208 | 212 |
209 .step-logo { | 213 #step-logo { |
214 -webkit-margin-start: 17px; | |
210 position: absolute; | 215 position: absolute; |
211 top: 15px; | 216 top: 15px; |
212 } | 217 } |
213 | 218 |
214 html[dir=ltr] .step-logo { | |
215 left: 17px; | |
216 } | |
217 | |
218 html[dir=rtl] .step-logo { | |
219 right: 17px; | |
220 } | |
221 | |
222 html[oobe=new] #connect .step-contents { | 219 html[oobe=new] #connect .step-contents { |
223 /* TODO(nkostylev): Update after content layout changes. */ | 220 /* TODO(nkostylev): Update after content layout changes. */ |
224 -webkit-margin-after: 82px; | 221 -webkit-margin-after: 82px; |
225 -webkit-margin-before: 82px; | 222 -webkit-margin-before: 82px; |
226 -webkit-margin-start: 145px; | 223 -webkit-margin-start: 145px; |
227 } | 224 } |
228 | 225 |
229 html[oobe=new] #eula .step-contents { | 226 html[oobe=new] #eula .step-contents { |
230 -webkit-margin-after: 30px; | 227 -webkit-margin-after: 30px; |
231 -webkit-margin-start: 32px; | 228 -webkit-margin-start: 32px; |
(...skipping 14 matching lines...) Expand all Loading... | |
246 } | 243 } |
247 | 244 |
248 html[oobe=new] #user-image-screen-curtain { | 245 html[oobe=new] #user-image-screen-curtain { |
249 -webkit-margin-start: 8px; | 246 -webkit-margin-start: 8px; |
250 } | 247 } |
251 | 248 |
252 html[oobe=new] #user-image-screen-description { | 249 html[oobe=new] #user-image-screen-description { |
253 -webkit-margin-before: 0; | 250 -webkit-margin-before: 0; |
254 } | 251 } |
255 | 252 |
253 .step { | |
254 position: absolute; | |
255 } | |
256 | |
256 html[oobe=old] .step { | 257 html[oobe=old] .step { |
257 min-height: 294px; | 258 min-height: 294px; |
258 opacity: 1; | 259 opacity: 1; |
259 position: absolute; | |
260 width: 640px; | 260 width: 640px; |
261 } | 261 } |
262 | 262 |
263 html[oobe=new] .step { | 263 html[oobe=new] .step { |
264 background: -webkit-linear-gradient(rgba(255,255,255,0.99), | 264 box-sizing: border-box; |
265 rgba(255,255,255,0.95)); | 265 } |
266 border-radius: 2px; | 266 |
267 box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), | 267 html[oobe=new] .step.animated { |
268 0 4px 23px 5px rgba(0, 0, 0, 0.2), | 268 -webkit-transition: -webkit-transform 400ms ease, |
269 0 2px 6px rgba(0, 0, 0, 0.15); | 269 opacity 400ms ease, |
270 position: absolute; | 270 visibility 400ms ease; |
271 } | 271 } |
272 | 272 |
273 html[oobe=old][dir=ltr] .step { | 273 html[oobe=old][dir=ltr] .step { |
274 /* TODO(nkostylev): Change to new transitions. */ | |
275 -webkit-transition: left 200ms, opacity 200ms, visibility 200ms ease-in-out; | 274 -webkit-transition: left 200ms, opacity 200ms, visibility 200ms ease-in-out; |
276 left: 0; | 275 left: 0; |
277 } | 276 } |
278 | 277 |
279 html[oobe=old][dir=rtl] .step { | 278 html[oobe=old][dir=rtl] .step { |
280 /* TODO(nkostylev): Change to new transitions. */ | |
281 -webkit-transition: right 200ms, opacity 200ms, visibility 200ms ease-in-out; | 279 -webkit-transition: right 200ms, opacity 200ms, visibility 200ms ease-in-out; |
282 right: 0; | 280 right: 0; |
283 } | 281 } |
284 | 282 |
285 .step.right { | 283 html[oobe=old] .step.right { |
286 left: 100px; | 284 left: 100px; |
287 } | 285 } |
288 | 286 |
289 .step.left { | 287 html[oobe=old] .step.left { |
290 left: -50px; | 288 left: -50px; |
291 } | 289 } |
292 | 290 |
293 html[dir=rtl] .step.right { | 291 html[oobe=old][dir=rtl] .step.right { |
294 right: 100px; | 292 right: 100px; |
295 } | 293 } |
296 | 294 |
297 html[dir=rtl] .step.left { | 295 html[oobe=old][dir=rtl] .step.left { |
298 right: -50px; | 296 right: -50px; |
299 } | 297 } |
300 | 298 |
301 .step.hidden { | 299 .step.hidden { |
302 visibility: hidden; | 300 visibility: hidden; |
303 } | 301 } |
304 | 302 |
305 /* Have to add attribute selector here otherwise style html[oobe=old] .step | 303 /* Have to add attribute selector here otherwise style html[oobe=old] .step |
306 has more points. */ | 304 has more points. */ |
307 html[oobe=old] .faded, | 305 html[oobe=old] .faded, |
308 html[oobe=old] .left, | 306 html[oobe=old] .left, |
309 html[oobe=old] .right { | 307 html[oobe=old] .right { |
310 opacity: 0; | 308 opacity: 0; |
311 } | 309 } |
312 | 310 |
313 html[oobe=new] .faded, | 311 html[oobe=new] .step.faded, |
314 html[oobe=new] .left, | 312 html[oobe=new] .step.left, |
315 html[oobe=new] .right { | 313 html[oobe=new] .step.right { |
316 opacity: 0; | 314 opacity: 0; |
317 } | 315 } |
318 | 316 |
317 html[oobe=new] .step.right { | |
318 -webkit-transform: translateX(50px); | |
319 } | |
320 | |
321 html[oobe=new] .step.left { | |
322 -webkit-transform: translateX(-50px) | |
323 } | |
324 | |
319 #footer { | 325 #footer { |
320 -webkit-box-align: center; | 326 -webkit-box-align: center; |
321 display: -webkit-box; | 327 display: -webkit-box; |
322 } | 328 } |
323 | 329 |
324 /* TODO(nkostylev): Remove all #footer related rules. */ | 330 /* TODO(nkostylev): Remove all #footer related rules. */ |
325 html[oobe=new] #footer { | 331 html[oobe=new] #footer { |
326 display: none; | 332 display: none; |
327 } | 333 } |
328 | 334 |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
393 .flexible-label { | 399 .flexible-label { |
394 max-width: 250px; | 400 max-width: 250px; |
395 } | 401 } |
396 | 402 |
397 html[oobe=old] #connect { | 403 html[oobe=old] #connect { |
398 box-sizing: border-box; | 404 box-sizing: border-box; |
399 padding: 60px 0 0 145px; | 405 padding: 60px 0 0 145px; |
400 } | 406 } |
401 | 407 |
402 /* Padding for header and buttons. */ | 408 /* Padding for header and buttons. */ |
403 /* TODO(nkostylev): Extract common style for OOBE steps. */ | |
404 html[oobe=new] #connect { | 409 html[oobe=new] #connect { |
405 min-height: 304px; | 410 min-height: 395px; |
406 padding: 70px 17px 21px; | 411 padding: 70px 17px 21px; |
407 width: 688px; | |
408 } | 412 } |
409 | 413 |
410 html[oobe=new] #eula { | 414 html[oobe=new] #eula { |
411 min-height: 304px; | 415 min-height: 395px; |
412 padding: 70px 17px 21px; | 416 padding: 70px 17px 21px; |
413 width: 688px; | |
414 } | 417 } |
415 | 418 |
416 html[oobe=new] #update { | 419 html[oobe=new] #update { |
417 min-height: 284px; | 420 min-height: 423px; |
418 padding: 70px 17px 69px; /* Screen has no controls. */ | 421 padding: 70px 17px 69px; /* Screen has no controls. */ |
419 width: 688px; | |
420 } | 422 } |
421 | 423 |
422 html[oobe=new] #gaia-signin { | 424 html[oobe=new] #gaia-signin { |
423 height: 470px; | 425 height: 609px; |
424 padding: 70px 17px 69px; /* Screen has no controls. */ | 426 padding: 70px 17px 69px; /* Screen has no controls. */ |
425 width: 688px; | 427 width: 722px; |
426 } | 428 } |
427 | 429 |
428 html[oobe=new] #user-image { | 430 html[oobe=new] #user-image { |
429 min-height: 352px; | 431 min-height: 443px; |
430 padding: 70px 17px 21px; | 432 padding: 70px 17px 21px; |
431 width: 688px; | 433 width: 702px; |
432 } | 434 } |
433 | 435 |
434 html[oobe=new] #oauth-enrollment { | 436 html[oobe=new] #oauth-enrollment { |
435 min-height: 518px; | 437 min-height: 609px; |
436 padding: 70px 17px 21px; | 438 padding: 70px 17px 21px; |
437 width: 688px; | 439 width: 722px; |
438 } | 440 } |
439 | 441 |
440 #logging { | 442 #logging { |
441 clear: both; | 443 clear: both; |
442 font-size: small; | 444 font-size: small; |
443 margin-top: 20px; | 445 margin-top: 20px; |
444 width: 500px; | 446 width: 500px; |
445 } | 447 } |
446 | 448 |
447 html[oobe=new] #logging { | 449 html[oobe=new] #logging { |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
683 | 685 |
684 #button-strip { | 686 #button-strip { |
685 -webkit-box-align: center; | 687 -webkit-box-align: center; |
686 -webkit-box-flex: 1; | 688 -webkit-box-flex: 1; |
687 -webkit-box-pack: end; | 689 -webkit-box-pack: end; |
688 display: -webkit-box; | 690 display: -webkit-box; |
689 } | 691 } |
690 | 692 |
691 .step-controls { | 693 .step-controls { |
692 -webkit-box-pack: end; | 694 -webkit-box-pack: end; |
695 -webkit-padding-end: 34px; /* Double the padding of .step */ | |
696 bottom: 21px; | |
697 box-sizing: border-box; | |
693 display: -webkit-box; | 698 display: -webkit-box; |
694 height: 28px | 699 height: 28px; |
700 position: absolute; | |
701 width: 100%; | |
702 } | |
703 | |
704 .step-controls button { | |
705 /* Don't grey out disabled buttons. */ | |
Nikita (slow)
2012/08/10 08:43:21
But that would break "Continue" button behavior, r
Ivan Korotkov
2012/08/10 10:12:41
Right, fixed.
| |
706 color: buttontext !important; | |
695 } | 707 } |
696 | 708 |
697 html[oobe=old] .step-controls { | 709 html[oobe=old] .step-controls { |
698 display: none; | 710 display: none; |
699 } | 711 } |
700 | 712 |
701 #oobe.connect #continue-button, | 713 #oobe.connect #continue-button, |
702 #oobe.eula #back-button, | 714 #oobe.eula #back-button, |
703 #oobe.eula #accept-button, | 715 #oobe.eula #accept-button, |
704 #oobe.signin #signin-button, | 716 #oobe.signin #signin-button, |
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1267 width: 100%; | 1279 width: 100%; |
1268 } | 1280 } |
1269 | 1281 |
1270 .background-initial { | 1282 .background-initial { |
1271 opacity: 0; | 1283 opacity: 0; |
1272 } | 1284 } |
1273 | 1285 |
1274 .background-final { | 1286 .background-final { |
1275 opacity: 1; | 1287 opacity: 1; |
1276 } | 1288 } |
OLD | NEW |