Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: chrome/browser/resources/chromeos/login/oobe.css

Issue 10827169: [cros] OOBE slide animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 {
11 height: 100%; 11 height: 100%;
12 width: 100%; 12 width: 100%;
13 } 13 }
14 14
15 body { 15 body {
16 font-size: 14px; 16 font-size: 14px;
17 margin: 0; 17 margin: 0;
18 overflow: hidden; 18 overflow: hidden;
19 padding: 0; 19 padding: 0;
20 position: fixed;
21 top: 0;
20 } 22 }
21 23
22 html[oobe=old] body { 24 html[oobe=old] body {
23 background-color: #fefefe; 25 background-color: #fefefe;
24 } 26 }
25 27
26 html[oobe=new]:not([screen=lock]) body { 28 html[oobe=new]:not([screen=lock]) body {
27 background-color: transparent; 29 background-color: transparent;
28 } 30 }
29 31
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 min-width: 72px !important; 67 min-width: 72px !important;
66 } 68 }
67 69
68 #back-button { 70 #back-button {
69 -webkit-margin-end: 8px; 71 -webkit-margin-end: 8px;
70 } 72 }
71 73
72 #outer-container { 74 #outer-container {
73 -webkit-box-align: center; 75 -webkit-box-align: center;
74 -webkit-box-pack: center; 76 -webkit-box-pack: center;
77 -webkit-perspective: 600px;
75 bottom: 41px; /* Leave space for the header bar */ 78 bottom: 41px; /* Leave space for the header bar */
76 display: -webkit-box; 79 display: -webkit-box;
77 left: 0; 80 left: 0;
78 position: absolute; 81 position: absolute;
79 right: 0; 82 right: 0;
80 top: 0; 83 top: 0;
81 } 84 }
82 85
83 html[oobe=old] #oobe { 86 html[oobe=old] #oobe {
84 margin-top: 20px; /* Compensate bottom header to center content. */ 87 margin-top: 20px; /* Compensate bottom header to center content. */
85 } 88 }
86 89
87 html[oobe=new] #oobe { 90 html[oobe=new] #oobe {
88 margin-top: 40px; /* Compensate bottom header to center content. */ 91 margin-top: 40px; /* Compensate bottom header to center content. */
89 } 92 }
90 93
91 #inner-container { 94 #inner-container {
92 /* Height/width of each step is set manually, 95 position: relative;
93 see DisplayManager.toggleStep_() */ 96 }
97
98 html[oobe=old] #inner-container {
94 height: 294px; 99 height: 294px;
95 position: relative; 100 padding: 20px;
96 width: 640px; 101 width: 640px;
97 } 102 }
98 103
99 html[oobe=old] #inner-container { 104 html[oobe=new] #inner-container {
100 padding: 20px; 105 background: -webkit-linear-gradient(rgba(255,255,255,0.99),
106 rgba(255,255,255,0.95));
107 border-radius: 2px;
108 box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3),
109 0 4px 23px 5px rgba(0, 0, 0, 0.2),
110 0 2px 6px rgba(0, 0, 0, 0.15);
111 overflow: hidden;
112 padding: 0;
101 } 113 }
102 114
103 html[oobe=new] #inner-container { 115 /* Account picker has no border and background. */
104 padding: 0; 116 html[oobe=new] .account-picker #inner-container {
117 background: none;
118 box-shadow: none;
119 }
120
121 /* Only play this animation when 'down' class is removed. */
122 html[oobe=new] #inner-container:not(.down) {
123 -webkit-transition: -webkit-transform 400ms ease;
124 }
125
126 html[oobe=new] #inner-container.down {
127 -webkit-transform: translateY(50px) rotateX(-2.5deg);
105 } 128 }
106 129
107 #security-info a, 130 #security-info a,
108 #security-tpm a, 131 #security-tpm a,
109 #eula a { 132 #eula a {
110 color: rgb(0, 102, 104); 133 color: rgb(0, 102, 104);
111 text-decoration: none; 134 text-decoration: none;
112 } 135 }
113 136
114 #eula #stats-help-link { 137 #eula #stats-help-link {
(...skipping 16 matching lines...) Expand all
131 hr.bottom { 154 hr.bottom {
132 background: -webkit-linear-gradient(bottom, 155 background: -webkit-linear-gradient(bottom,
133 rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)); 156 rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
134 border-bottom: 1px solid rgba(0, 0, 0, 0.5); 157 border-bottom: 1px solid rgba(0, 0, 0, 0.5);
135 height: 4px; 158 height: 4px;
136 z-index: 0; 159 z-index: 0;
137 } 160 }
138 161
139 #header { 162 #header {
140 -webkit-padding-start: 45px; 163 -webkit-padding-start: 45px;
141 /* TODO(thakis): Move oobe.html to a structure element, then the 164 background-image: url('chrome://theme/IDR_PRODUCT_LOGO_32');
142 * image set should be inserted automatically. */
143 background-image: -webkit-image-set(
144 url('chrome://theme/IDR_PRODUCT_LOGO_32') 1x,
145 url('chrome://theme/IDR_PRODUCT_LOGO_32@2x') 2x);
146 background-position: left center; 165 background-position: left center;
147 background-repeat: no-repeat; 166 background-repeat: no-repeat;
148 background-size: 32px; 167 background-size: 32px;
149 color: #666; 168 color: #666;
150 display: -webkit-box; 169 display: -webkit-box;
151 font-size: 23px; 170 font-size: 23px;
152 height: 47px; 171 height: 47px;
153 line-height: 45px; 172 line-height: 45px;
154 padding-top: 1px; 173 padding-top: 1px;
155 } 174 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 } 222 }
204 223
205 html[dir=rtl] .header-section.right { 224 html[dir=rtl] .header-section.right {
206 right: 50px; 225 right: 50px;
207 } 226 }
208 227
209 html[dir=rtl] .header-section.left { 228 html[dir=rtl] .header-section.left {
210 right: -20px; 229 right: -20px;
211 } 230 }
212 231
213 html[oobe=old] .step-logo { 232 html[oobe=old] #step-logo {
214 display: none; 233 display: none;
215 } 234 }
216 235
217 .step-logo { 236 #step-logo {
237 -webkit-margin-start: 17px;
218 position: absolute; 238 position: absolute;
219 top: 15px; 239 top: 15px;
220 } 240 }
221 241
222 html[dir=ltr] .step-logo {
223 left: 17px;
224 }
225
226 html[dir=rtl] .step-logo {
227 right: 17px;
228 }
229
230 html[oobe=new] #connect .step-contents { 242 html[oobe=new] #connect .step-contents {
231 /* TODO(nkostylev): Update after content layout changes. */ 243 /* TODO(nkostylev): Update after content layout changes. */
232 -webkit-margin-after: 82px; 244 -webkit-margin-after: 82px;
233 -webkit-margin-before: 82px; 245 -webkit-margin-before: 82px;
234 -webkit-margin-start: 145px; 246 -webkit-margin-start: 145px;
235 } 247 }
236 248
237 html[oobe=new] #eula .step-contents { 249 html[oobe=new] #eula .step-contents {
238 -webkit-margin-after: 30px; 250 -webkit-margin-after: 30px;
239 -webkit-margin-start: 32px; 251 -webkit-margin-start: 32px;
(...skipping 14 matching lines...) Expand all
254 } 266 }
255 267
256 html[oobe=new] #user-image-screen-curtain { 268 html[oobe=new] #user-image-screen-curtain {
257 -webkit-margin-start: 8px; 269 -webkit-margin-start: 8px;
258 } 270 }
259 271
260 html[oobe=new] #user-image-screen-description { 272 html[oobe=new] #user-image-screen-description {
261 -webkit-margin-before: 0; 273 -webkit-margin-before: 0;
262 } 274 }
263 275
276 .step {
277 position: absolute;
278 }
279
264 html[oobe=old] .step { 280 html[oobe=old] .step {
265 min-height: 294px; 281 min-height: 294px;
266 opacity: 1; 282 opacity: 1;
267 position: absolute;
268 width: 640px; 283 width: 640px;
269 } 284 }
270 285
271 html[oobe=new] .step { 286 html[oobe=new] .step {
272 background: -webkit-linear-gradient(rgba(255,255,255,0.99), 287 box-sizing: border-box;
273 rgba(255,255,255,0.95)); 288 }
274 border-radius: 2px; 289
275 box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), 290 html[oobe=new] .step.animated {
276 0 4px 23px 5px rgba(0, 0, 0, 0.2), 291 -webkit-transition: -webkit-transform 400ms ease,
277 0 2px 6px rgba(0, 0, 0, 0.15); 292 opacity 400ms ease,
278 position: absolute; 293 visibility 400ms ease;
279 } 294 }
280 295
281 html[oobe=old][dir=ltr] .step { 296 html[oobe=old][dir=ltr] .step {
282 /* TODO(nkostylev): Change to new transitions. */
283 -webkit-transition: left 200ms, opacity 200ms, visibility 200ms ease-in-out; 297 -webkit-transition: left 200ms, opacity 200ms, visibility 200ms ease-in-out;
284 left: 0; 298 left: 0;
285 } 299 }
286 300
287 html[oobe=old][dir=rtl] .step { 301 html[oobe=old][dir=rtl] .step {
288 /* TODO(nkostylev): Change to new transitions. */
289 -webkit-transition: right 200ms, opacity 200ms, visibility 200ms ease-in-out; 302 -webkit-transition: right 200ms, opacity 200ms, visibility 200ms ease-in-out;
290 right: 0; 303 right: 0;
291 } 304 }
292 305
293 .step.right { 306 html[oobe=old] .step.right {
294 left: 100px; 307 left: 100px;
295 } 308 }
296 309
297 .step.left { 310 html[oobe=old] .step.left {
298 left: -50px; 311 left: -50px;
299 } 312 }
300 313
301 html[dir=rtl] .step.right { 314 html[oobe=old][dir=rtl] .step.right {
302 right: 100px; 315 right: 100px;
303 } 316 }
304 317
305 html[dir=rtl] .step.left { 318 html[oobe=old][dir=rtl] .step.left {
306 right: -50px; 319 right: -50px;
307 } 320 }
308 321
309 .step.hidden { 322 .step.hidden {
310 visibility: hidden; 323 visibility: hidden;
311 } 324 }
312 325
313 /* Have to add attribute selector here otherwise style html[oobe=old] .step 326 /* Have to add attribute selector here otherwise style html[oobe=old] .step
314 has more points. */ 327 has more points. */
315 html[oobe=old] .faded, 328 html[oobe=old] .faded,
316 html[oobe=old] .left, 329 html[oobe=old] .left,
317 html[oobe=old] .right { 330 html[oobe=old] .right {
318 opacity: 0; 331 opacity: 0;
319 } 332 }
320 333
321 html[oobe=new] .faded, 334 html[oobe=new] .step.faded,
322 html[oobe=new] .left, 335 html[oobe=new] .step.left,
323 html[oobe=new] .right { 336 html[oobe=new] .step.right {
324 opacity: 0; 337 opacity: 0;
325 } 338 }
326 339
340 html[oobe=new] .step.right {
341 -webkit-transform: translateX(50px);
342 }
343
344 html[oobe=new] .step.left {
345 -webkit-transform: translateX(-50px)
346 }
347
327 #footer { 348 #footer {
328 -webkit-box-align: center; 349 -webkit-box-align: center;
329 display: -webkit-box; 350 display: -webkit-box;
330 } 351 }
331 352
332 /* TODO(nkostylev): Remove all #footer related rules. */ 353 /* TODO(nkostylev): Remove all #footer related rules. */
333 html[oobe=new] #footer { 354 html[oobe=new] #footer {
334 display: none; 355 display: none;
335 } 356 }
336 357
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 .flexible-label { 423 .flexible-label {
403 max-width: 250px; 424 max-width: 250px;
404 } 425 }
405 426
406 html[oobe=old] #connect { 427 html[oobe=old] #connect {
407 box-sizing: border-box; 428 box-sizing: border-box;
408 padding: 60px 0 0 145px; 429 padding: 60px 0 0 145px;
409 } 430 }
410 431
411 /* Padding for header and buttons. */ 432 /* Padding for header and buttons. */
412 /* TODO(nkostylev): Extract common style for OOBE steps. */
413 html[oobe=new] #connect { 433 html[oobe=new] #connect {
414 min-height: 304px; 434 min-height: 395px;
415 padding: 70px 17px 21px; 435 padding: 70px 17px 21px;
416 width: 688px;
417 } 436 }
418 437
419 html[oobe=new] #eula { 438 html[oobe=new] #eula {
420 min-height: 304px; 439 min-height: 395px;
421 padding: 70px 17px 21px; 440 padding: 70px 17px 21px;
422 width: 688px;
423 } 441 }
424 442
425 html[oobe=new] #update { 443 html[oobe=new] #update {
426 min-height: 284px; 444 min-height: 423px;
427 padding: 70px 17px 69px; /* Screen has no controls. */ 445 padding: 70px 17px 69px; /* Screen has no controls. */
428 width: 688px;
429 } 446 }
430 447
431 html[oobe=new] #gaia-signin { 448 html[oobe=new] #gaia-signin {
432 height: 470px; 449 height: 609px;
433 padding: 70px 17px 69px; /* Screen has no controls. */ 450 padding: 70px 17px 69px; /* Screen has no controls. */
434 width: 688px; 451 width: 722px;
435 } 452 }
436 453
437 html[oobe=new] #user-image { 454 html[oobe=new] #user-image {
438 min-height: 352px; 455 min-height: 443px;
439 padding: 70px 17px 21px; 456 padding: 70px 17px 21px;
440 width: 688px; 457 width: 702px;
441 } 458 }
442 459
443 html[oobe=new] #oauth-enrollment { 460 html[oobe=new] #oauth-enrollment {
444 min-height: 518px; 461 min-height: 609px;
445 padding: 70px 17px 21px; 462 padding: 70px 17px 21px;
446 width: 688px; 463 width: 722px;
447 } 464 }
448 465
449 #logging { 466 #logging {
450 clear: both; 467 clear: both;
451 font-size: small; 468 font-size: small;
452 margin-top: 20px; 469 margin-top: 20px;
453 width: 500px; 470 width: 500px;
454 } 471 }
455 472
456 html[oobe=new] #logging { 473 html[oobe=new] #logging {
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 709
693 #button-strip { 710 #button-strip {
694 -webkit-box-align: center; 711 -webkit-box-align: center;
695 -webkit-box-flex: 1; 712 -webkit-box-flex: 1;
696 -webkit-box-pack: end; 713 -webkit-box-pack: end;
697 display: -webkit-box; 714 display: -webkit-box;
698 } 715 }
699 716
700 .step-controls { 717 .step-controls {
701 -webkit-box-pack: end; 718 -webkit-box-pack: end;
719 -webkit-padding-end: 34px; /* Double the padding of .step */
720 bottom: 21px;
721 box-sizing: border-box;
702 display: -webkit-box; 722 display: -webkit-box;
703 height: 28px 723 height: 28px;
724 position: absolute;
725 width: 100%;
726 }
727
728 .animation .step-controls button {
729 /* Don't grey out disabled buttons during animation. */
730 color: buttontext !important;
704 } 731 }
705 732
706 html[oobe=old] .step-controls { 733 html[oobe=old] .step-controls {
707 display: none; 734 display: none;
708 } 735 }
709 736
710 #oobe.connect #continue-button, 737 #oobe.connect #continue-button,
711 #oobe.eula #back-button, 738 #oobe.eula #back-button,
712 #oobe.eula #accept-button, 739 #oobe.eula #accept-button,
713 #oobe.signin #signin-button, 740 #oobe.signin #signin-button,
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
1272 width: 100%; 1299 width: 100%;
1273 } 1300 }
1274 1301
1275 .background-initial { 1302 .background-initial {
1276 opacity: 0; 1303 opacity: 0;
1277 } 1304 }
1278 1305
1279 .background-final { 1306 .background-final {
1280 opacity: 1; 1307 opacity: 1;
1281 } 1308 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/network_dropdown.css ('k') | chrome/browser/resources/chromeos/login/oobe.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698