Index: chrome/browser/resources/chromeos/login/oobe.css |
diff --git a/chrome/browser/resources/chromeos/login/oobe.css b/chrome/browser/resources/chromeos/login/oobe.css |
index 6e4696f4b50bef16f130078d212d860fb90d5c4d..a3f8a2f66f372bb54e5ae558273bb16f27238be7 100644 |
--- a/chrome/browser/resources/chromeos/login/oobe.css |
+++ b/chrome/browser/resources/chromeos/login/oobe.css |
@@ -81,11 +81,7 @@ html[oobe=new] #oobe { |
} |
#inner-container { |
- /* Height/width of each step is set manually, |
- see DisplayManager.toggleStep_() */ |
- height: 294px; |
Nikita (slow)
2012/08/10 08:43:21
Could you please move this to [oobe=old] #inner-co
|
position: relative; |
- width: 640px; |
} |
html[oobe=old] #inner-container { |
@@ -93,6 +89,14 @@ html[oobe=old] #inner-container { |
} |
html[oobe=new] #inner-container { |
+ -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
|
+ background: -webkit-linear-gradient(rgba(255,255,255,0.99), |
+ rgba(255,255,255,0.95)); |
+ border-radius: 2px; |
+ box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), |
+ 0 4px 23px 5px rgba(0, 0, 0, 0.2), |
+ 0 2px 6px rgba(0, 0, 0, 0.15); |
+ overflow: hidden; |
padding: 0; |
} |
@@ -202,23 +206,16 @@ html[dir=rtl] .header-section.left { |
right: -20px; |
} |
-html[oobe=old] .step-logo { |
+html[oobe=old] #step-logo { |
display: none; |
} |
-.step-logo { |
+#step-logo { |
+ -webkit-margin-start: 17px; |
position: absolute; |
top: 15px; |
} |
-html[dir=ltr] .step-logo { |
- left: 17px; |
-} |
- |
-html[dir=rtl] .step-logo { |
- right: 17px; |
-} |
- |
html[oobe=new] #connect .step-contents { |
/* TODO(nkostylev): Update after content layout changes. */ |
-webkit-margin-after: 82px; |
@@ -253,48 +250,49 @@ html[oobe=new] #user-image-screen-description { |
-webkit-margin-before: 0; |
} |
+.step { |
+ position: absolute; |
+} |
+ |
html[oobe=old] .step { |
min-height: 294px; |
opacity: 1; |
- position: absolute; |
width: 640px; |
} |
html[oobe=new] .step { |
- background: -webkit-linear-gradient(rgba(255,255,255,0.99), |
- rgba(255,255,255,0.95)); |
- border-radius: 2px; |
- box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), |
- 0 4px 23px 5px rgba(0, 0, 0, 0.2), |
- 0 2px 6px rgba(0, 0, 0, 0.15); |
- position: absolute; |
+ box-sizing: border-box; |
+} |
+ |
+html[oobe=new] .step.animated { |
+ -webkit-transition: -webkit-transform 400ms ease, |
+ opacity 400ms ease, |
+ visibility 400ms ease; |
} |
html[oobe=old][dir=ltr] .step { |
- /* TODO(nkostylev): Change to new transitions. */ |
-webkit-transition: left 200ms, opacity 200ms, visibility 200ms ease-in-out; |
left: 0; |
} |
html[oobe=old][dir=rtl] .step { |
- /* TODO(nkostylev): Change to new transitions. */ |
-webkit-transition: right 200ms, opacity 200ms, visibility 200ms ease-in-out; |
right: 0; |
} |
-.step.right { |
+html[oobe=old] .step.right { |
left: 100px; |
} |
-.step.left { |
+html[oobe=old] .step.left { |
left: -50px; |
} |
-html[dir=rtl] .step.right { |
+html[oobe=old][dir=rtl] .step.right { |
right: 100px; |
} |
-html[dir=rtl] .step.left { |
+html[oobe=old][dir=rtl] .step.left { |
right: -50px; |
} |
@@ -310,12 +308,20 @@ html[oobe=old] .right { |
opacity: 0; |
} |
-html[oobe=new] .faded, |
-html[oobe=new] .left, |
-html[oobe=new] .right { |
+html[oobe=new] .step.faded, |
+html[oobe=new] .step.left, |
+html[oobe=new] .step.right { |
opacity: 0; |
} |
+html[oobe=new] .step.right { |
+ -webkit-transform: translateX(50px); |
+} |
+ |
+html[oobe=new] .step.left { |
+ -webkit-transform: translateX(-50px) |
+} |
+ |
#footer { |
-webkit-box-align: center; |
display: -webkit-box; |
@@ -400,41 +406,37 @@ html[oobe=old] #connect { |
} |
/* Padding for header and buttons. */ |
-/* TODO(nkostylev): Extract common style for OOBE steps. */ |
html[oobe=new] #connect { |
- min-height: 304px; |
+ min-height: 395px; |
padding: 70px 17px 21px; |
- width: 688px; |
} |
html[oobe=new] #eula { |
- min-height: 304px; |
+ min-height: 395px; |
padding: 70px 17px 21px; |
- width: 688px; |
} |
html[oobe=new] #update { |
- min-height: 284px; |
+ min-height: 423px; |
padding: 70px 17px 69px; /* Screen has no controls. */ |
- width: 688px; |
} |
html[oobe=new] #gaia-signin { |
- height: 470px; |
+ height: 609px; |
padding: 70px 17px 69px; /* Screen has no controls. */ |
- width: 688px; |
+ width: 722px; |
} |
html[oobe=new] #user-image { |
- min-height: 352px; |
+ min-height: 443px; |
padding: 70px 17px 21px; |
- width: 688px; |
+ width: 702px; |
} |
html[oobe=new] #oauth-enrollment { |
- min-height: 518px; |
+ min-height: 609px; |
padding: 70px 17px 21px; |
- width: 688px; |
+ width: 722px; |
} |
#logging { |
@@ -690,8 +692,18 @@ html[camera=webrtc] .camera.live.online #take-photo { |
.step-controls { |
-webkit-box-pack: end; |
+ -webkit-padding-end: 34px; /* Double the padding of .step */ |
+ bottom: 21px; |
+ box-sizing: border-box; |
display: -webkit-box; |
- height: 28px |
+ height: 28px; |
+ position: absolute; |
+ width: 100%; |
+} |
+ |
+.step-controls button { |
+ /* 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.
|
+ color: buttontext !important; |
} |
html[oobe=old] .step-controls { |