| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 min-width: 72px !important; | 65 min-width: 72px !important; |
| 66 } | 66 } |
| 67 | 67 |
| 68 #back-button { | 68 #back-button { |
| 69 -webkit-margin-end: 8px; | 69 -webkit-margin-end: 8px; |
| 70 } | 70 } |
| 71 | 71 |
| 72 #outer-container { | 72 #outer-container { |
| 73 -webkit-box-align: center; | 73 -webkit-box-align: center; |
| 74 -webkit-box-pack: center; | 74 -webkit-box-pack: center; |
| 75 -webkit-perspective: 600px; |
| 75 bottom: 41px; /* Leave space for the header bar */ | 76 bottom: 41px; /* Leave space for the header bar */ |
| 76 display: -webkit-box; | 77 display: -webkit-box; |
| 77 left: 0; | 78 left: 0; |
| 78 position: absolute; | 79 position: absolute; |
| 79 right: 0; | 80 right: 0; |
| 80 top: 0; | 81 top: 0; |
| 81 } | 82 } |
| 82 | 83 |
| 83 html[oobe=old] #oobe { | 84 html[oobe=old] #oobe { |
| 84 margin-top: 20px; /* Compensate bottom header to center content. */ | 85 margin-top: 20px; /* Compensate bottom header to center content. */ |
| 85 } | 86 } |
| 86 | 87 |
| 87 html[oobe=new] #oobe { | 88 html[oobe=new] #oobe { |
| 88 margin-top: 40px; /* Compensate bottom header to center content. */ | 89 margin-top: 40px; /* Compensate bottom header to center content. */ |
| 89 } | 90 } |
| 90 | 91 |
| 91 #inner-container { | 92 #inner-container { |
| 92 /* Height/width of each step is set manually, | |
| 93 see DisplayManager.toggleStep_() */ | |
| 94 height: 294px; | |
| 95 position: relative; | 93 position: relative; |
| 96 width: 640px; | |
| 97 } | 94 } |
| 98 | 95 |
| 99 html[oobe=old] #inner-container { | 96 html[oobe=old] #inner-container { |
| 100 padding: 20px; | 97 padding: 20px; |
| 101 } | 98 } |
| 102 | 99 |
| 103 html[oobe=new] #inner-container { | 100 html[oobe=new] #inner-container { |
| 101 background: -webkit-linear-gradient(rgba(255,255,255,0.99), |
| 102 rgba(255,255,255,0.95)); |
| 103 border-radius: 2px; |
| 104 box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), |
| 105 0 4px 23px 5px rgba(0, 0, 0, 0.2), |
| 106 0 2px 6px rgba(0, 0, 0, 0.15); |
| 107 overflow: hidden; |
| 104 padding: 0; | 108 padding: 0; |
| 105 } | 109 } |
| 106 | 110 |
| 111 /* Only play this animation when 'down' class is removed. */ |
| 112 html[oobe=new] #inner-container:not(.down) { |
| 113 -webkit-transition: -webkit-transform 400ms ease; |
| 114 } |
| 115 |
| 116 html[oobe=new] #inner-container.down { |
| 117 -webkit-transform: translateY(50px) rotateX(-2.5deg); |
| 118 } |
| 119 |
| 107 #security-info a, | 120 #security-info a, |
| 108 #security-tpm a, | 121 #security-tpm a, |
| 109 #eula a { | 122 #eula a { |
| 110 color: rgb(0, 102, 104); | 123 color: rgb(0, 102, 104); |
| 111 text-decoration: none; | 124 text-decoration: none; |
| 112 } | 125 } |
| 113 | 126 |
| 114 #eula #stats-help-link { | 127 #eula #stats-help-link { |
| 115 color: rgb(49, 106, 197); | 128 color: rgb(49, 106, 197); |
| 116 } | 129 } |
| (...skipping 14 matching lines...) Expand all Loading... |
| 131 hr.bottom { | 144 hr.bottom { |
| 132 background: -webkit-linear-gradient(bottom, | 145 background: -webkit-linear-gradient(bottom, |
| 133 rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)); | 146 rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)); |
| 134 border-bottom: 1px solid rgba(0, 0, 0, 0.5); | 147 border-bottom: 1px solid rgba(0, 0, 0, 0.5); |
| 135 height: 4px; | 148 height: 4px; |
| 136 z-index: 0; | 149 z-index: 0; |
| 137 } | 150 } |
| 138 | 151 |
| 139 #header { | 152 #header { |
| 140 -webkit-padding-start: 45px; | 153 -webkit-padding-start: 45px; |
| 141 /* TODO(thakis): Move oobe.html to a structure element, then the | 154 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; | 155 background-position: left center; |
| 147 background-repeat: no-repeat; | 156 background-repeat: no-repeat; |
| 148 background-size: 32px; | 157 background-size: 32px; |
| 149 color: #666; | 158 color: #666; |
| 150 display: -webkit-box; | 159 display: -webkit-box; |
| 151 font-size: 23px; | 160 font-size: 23px; |
| 152 height: 47px; | 161 height: 47px; |
| 153 line-height: 45px; | 162 line-height: 45px; |
| 154 padding-top: 1px; | 163 padding-top: 1px; |
| 155 } | 164 } |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 } | 212 } |
| 204 | 213 |
| 205 html[dir=rtl] .header-section.right { | 214 html[dir=rtl] .header-section.right { |
| 206 right: 50px; | 215 right: 50px; |
| 207 } | 216 } |
| 208 | 217 |
| 209 html[dir=rtl] .header-section.left { | 218 html[dir=rtl] .header-section.left { |
| 210 right: -20px; | 219 right: -20px; |
| 211 } | 220 } |
| 212 | 221 |
| 213 html[oobe=old] .step-logo { | 222 html[oobe=old] #step-logo { |
| 214 display: none; | 223 display: none; |
| 215 } | 224 } |
| 216 | 225 |
| 217 .step-logo { | 226 #step-logo { |
| 227 -webkit-margin-start: 17px; |
| 218 position: absolute; | 228 position: absolute; |
| 219 top: 15px; | 229 top: 15px; |
| 220 } | 230 } |
| 221 | 231 |
| 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 { | 232 html[oobe=new] #connect .step-contents { |
| 231 /* TODO(nkostylev): Update after content layout changes. */ | 233 /* TODO(nkostylev): Update after content layout changes. */ |
| 232 -webkit-margin-after: 82px; | 234 -webkit-margin-after: 82px; |
| 233 -webkit-margin-before: 82px; | 235 -webkit-margin-before: 82px; |
| 234 -webkit-margin-start: 145px; | 236 -webkit-margin-start: 145px; |
| 235 } | 237 } |
| 236 | 238 |
| 237 html[oobe=new] #eula .step-contents { | 239 html[oobe=new] #eula .step-contents { |
| 238 -webkit-margin-after: 30px; | 240 -webkit-margin-after: 30px; |
| 239 -webkit-margin-start: 32px; | 241 -webkit-margin-start: 32px; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 254 } | 256 } |
| 255 | 257 |
| 256 html[oobe=new] #user-image-screen-curtain { | 258 html[oobe=new] #user-image-screen-curtain { |
| 257 -webkit-margin-start: 8px; | 259 -webkit-margin-start: 8px; |
| 258 } | 260 } |
| 259 | 261 |
| 260 html[oobe=new] #user-image-screen-description { | 262 html[oobe=new] #user-image-screen-description { |
| 261 -webkit-margin-before: 0; | 263 -webkit-margin-before: 0; |
| 262 } | 264 } |
| 263 | 265 |
| 266 .step { |
| 267 position: absolute; |
| 268 } |
| 269 |
| 264 html[oobe=old] .step { | 270 html[oobe=old] .step { |
| 265 min-height: 294px; | 271 min-height: 294px; |
| 266 opacity: 1; | 272 opacity: 1; |
| 267 position: absolute; | |
| 268 width: 640px; | 273 width: 640px; |
| 269 } | 274 } |
| 270 | 275 |
| 271 html[oobe=new] .step { | 276 html[oobe=new] .step { |
| 272 background: -webkit-linear-gradient(rgba(255,255,255,0.99), | 277 box-sizing: border-box; |
| 273 rgba(255,255,255,0.95)); | 278 } |
| 274 border-radius: 2px; | 279 |
| 275 box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), | 280 html[oobe=new] .step.animated { |
| 276 0 4px 23px 5px rgba(0, 0, 0, 0.2), | 281 -webkit-transition: -webkit-transform 400ms ease, |
| 277 0 2px 6px rgba(0, 0, 0, 0.15); | 282 opacity 400ms ease, |
| 278 position: absolute; | 283 visibility 400ms ease; |
| 279 } | 284 } |
| 280 | 285 |
| 281 html[oobe=old][dir=ltr] .step { | 286 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; | 287 -webkit-transition: left 200ms, opacity 200ms, visibility 200ms ease-in-out; |
| 284 left: 0; | 288 left: 0; |
| 285 } | 289 } |
| 286 | 290 |
| 287 html[oobe=old][dir=rtl] .step { | 291 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; | 292 -webkit-transition: right 200ms, opacity 200ms, visibility 200ms ease-in-out; |
| 290 right: 0; | 293 right: 0; |
| 291 } | 294 } |
| 292 | 295 |
| 293 .step.right { | 296 html[oobe=old] .step.right { |
| 294 left: 100px; | 297 left: 100px; |
| 295 } | 298 } |
| 296 | 299 |
| 297 .step.left { | 300 html[oobe=old] .step.left { |
| 298 left: -50px; | 301 left: -50px; |
| 299 } | 302 } |
| 300 | 303 |
| 301 html[dir=rtl] .step.right { | 304 html[oobe=old][dir=rtl] .step.right { |
| 302 right: 100px; | 305 right: 100px; |
| 303 } | 306 } |
| 304 | 307 |
| 305 html[dir=rtl] .step.left { | 308 html[oobe=old][dir=rtl] .step.left { |
| 306 right: -50px; | 309 right: -50px; |
| 307 } | 310 } |
| 308 | 311 |
| 309 .step.hidden { | 312 .step.hidden { |
| 310 visibility: hidden; | 313 visibility: hidden; |
| 311 } | 314 } |
| 312 | 315 |
| 313 /* Have to add attribute selector here otherwise style html[oobe=old] .step | 316 /* Have to add attribute selector here otherwise style html[oobe=old] .step |
| 314 has more points. */ | 317 has more points. */ |
| 315 html[oobe=old] .faded, | 318 html[oobe=old] .faded, |
| 316 html[oobe=old] .left, | 319 html[oobe=old] .left, |
| 317 html[oobe=old] .right { | 320 html[oobe=old] .right { |
| 318 opacity: 0; | 321 opacity: 0; |
| 319 } | 322 } |
| 320 | 323 |
| 321 html[oobe=new] .faded, | 324 html[oobe=new] .step.faded, |
| 322 html[oobe=new] .left, | 325 html[oobe=new] .step.left, |
| 323 html[oobe=new] .right { | 326 html[oobe=new] .step.right { |
| 324 opacity: 0; | 327 opacity: 0; |
| 325 } | 328 } |
| 326 | 329 |
| 330 html[oobe=new] .step.right { |
| 331 -webkit-transform: translateX(50px); |
| 332 } |
| 333 |
| 334 html[oobe=new] .step.left { |
| 335 -webkit-transform: translateX(-50px) |
| 336 } |
| 337 |
| 327 #footer { | 338 #footer { |
| 328 -webkit-box-align: center; | 339 -webkit-box-align: center; |
| 329 display: -webkit-box; | 340 display: -webkit-box; |
| 330 } | 341 } |
| 331 | 342 |
| 332 /* TODO(nkostylev): Remove all #footer related rules. */ | 343 /* TODO(nkostylev): Remove all #footer related rules. */ |
| 333 html[oobe=new] #footer { | 344 html[oobe=new] #footer { |
| 334 display: none; | 345 display: none; |
| 335 } | 346 } |
| 336 | 347 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 .flexible-label { | 413 .flexible-label { |
| 403 max-width: 250px; | 414 max-width: 250px; |
| 404 } | 415 } |
| 405 | 416 |
| 406 html[oobe=old] #connect { | 417 html[oobe=old] #connect { |
| 407 box-sizing: border-box; | 418 box-sizing: border-box; |
| 408 padding: 60px 0 0 145px; | 419 padding: 60px 0 0 145px; |
| 409 } | 420 } |
| 410 | 421 |
| 411 /* Padding for header and buttons. */ | 422 /* Padding for header and buttons. */ |
| 412 /* TODO(nkostylev): Extract common style for OOBE steps. */ | |
| 413 html[oobe=new] #connect { | 423 html[oobe=new] #connect { |
| 414 min-height: 304px; | 424 min-height: 395px; |
| 415 padding: 70px 17px 21px; | 425 padding: 70px 17px 21px; |
| 416 width: 688px; | |
| 417 } | 426 } |
| 418 | 427 |
| 419 html[oobe=new] #eula { | 428 html[oobe=new] #eula { |
| 420 min-height: 304px; | 429 min-height: 395px; |
| 421 padding: 70px 17px 21px; | 430 padding: 70px 17px 21px; |
| 422 width: 688px; | |
| 423 } | 431 } |
| 424 | 432 |
| 425 html[oobe=new] #update { | 433 html[oobe=new] #update { |
| 426 min-height: 284px; | 434 min-height: 423px; |
| 427 padding: 70px 17px 69px; /* Screen has no controls. */ | 435 padding: 70px 17px 69px; /* Screen has no controls. */ |
| 428 width: 688px; | |
| 429 } | 436 } |
| 430 | 437 |
| 431 html[oobe=new] #gaia-signin { | 438 html[oobe=new] #gaia-signin { |
| 432 height: 470px; | 439 height: 609px; |
| 433 padding: 70px 17px 69px; /* Screen has no controls. */ | 440 padding: 70px 17px 69px; /* Screen has no controls. */ |
| 434 width: 688px; | 441 width: 722px; |
| 435 } | 442 } |
| 436 | 443 |
| 437 html[oobe=new] #user-image { | 444 html[oobe=new] #user-image { |
| 438 min-height: 352px; | 445 min-height: 443px; |
| 439 padding: 70px 17px 21px; | 446 padding: 70px 17px 21px; |
| 440 width: 688px; | 447 width: 702px; |
| 441 } | 448 } |
| 442 | 449 |
| 443 html[oobe=new] #oauth-enrollment { | 450 html[oobe=new] #oauth-enrollment { |
| 444 min-height: 518px; | 451 min-height: 609px; |
| 445 padding: 70px 17px 21px; | 452 padding: 70px 17px 21px; |
| 446 width: 688px; | 453 width: 722px; |
| 447 } | 454 } |
| 448 | 455 |
| 449 #logging { | 456 #logging { |
| 450 clear: both; | 457 clear: both; |
| 451 font-size: small; | 458 font-size: small; |
| 452 margin-top: 20px; | 459 margin-top: 20px; |
| 453 width: 500px; | 460 width: 500px; |
| 454 } | 461 } |
| 455 | 462 |
| 456 html[oobe=new] #logging { | 463 html[oobe=new] #logging { |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 | 699 |
| 693 #button-strip { | 700 #button-strip { |
| 694 -webkit-box-align: center; | 701 -webkit-box-align: center; |
| 695 -webkit-box-flex: 1; | 702 -webkit-box-flex: 1; |
| 696 -webkit-box-pack: end; | 703 -webkit-box-pack: end; |
| 697 display: -webkit-box; | 704 display: -webkit-box; |
| 698 } | 705 } |
| 699 | 706 |
| 700 .step-controls { | 707 .step-controls { |
| 701 -webkit-box-pack: end; | 708 -webkit-box-pack: end; |
| 709 -webkit-padding-end: 34px; /* Double the padding of .step */ |
| 710 bottom: 21px; |
| 711 box-sizing: border-box; |
| 702 display: -webkit-box; | 712 display: -webkit-box; |
| 703 height: 28px | 713 height: 28px; |
| 714 position: absolute; |
| 715 width: 100%; |
| 716 } |
| 717 |
| 718 .animation .step-controls button { |
| 719 /* Don't grey out disabled buttons during animation. */ |
| 720 color: buttontext !important; |
| 704 } | 721 } |
| 705 | 722 |
| 706 html[oobe=old] .step-controls { | 723 html[oobe=old] .step-controls { |
| 707 display: none; | 724 display: none; |
| 708 } | 725 } |
| 709 | 726 |
| 710 #oobe.connect #continue-button, | 727 #oobe.connect #continue-button, |
| 711 #oobe.eula #back-button, | 728 #oobe.eula #back-button, |
| 712 #oobe.eula #accept-button, | 729 #oobe.eula #accept-button, |
| 713 #oobe.signin #signin-button, | 730 #oobe.signin #signin-button, |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1272 width: 100%; | 1289 width: 100%; |
| 1273 } | 1290 } |
| 1274 | 1291 |
| 1275 .background-initial { | 1292 .background-initial { |
| 1276 opacity: 0; | 1293 opacity: 0; |
| 1277 } | 1294 } |
| 1278 | 1295 |
| 1279 .background-final { | 1296 .background-final { |
| 1280 opacity: 1; | 1297 opacity: 1; |
| 1281 } | 1298 } |
| OLD | NEW |