Chromium Code Reviews Chromium Code Reviews
Issue 8271025:
Moved mobile activation into its own modal dialog (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/| Index: chrome/browser/resources/mobile_setup.html |
| =================================================================== |
| --- chrome/browser/resources/mobile_setup.html (revision 105363) |
| +++ chrome/browser/resources/mobile_setup.html (working copy) |
| @@ -5,19 +5,36 @@ |
| <title i18n-content="title"></title> |
| <style> |
| body { |
| - font-family: arial, sans-serif; |
| - font-size: 13px; |
| - line-height: 22px; |
| - -webkit-user-select: none; |
| + -webkit-box-flex: 1; |
|
xiyuan
2011/10/15 15:56:19
We can get rid of this since this only affects chi
zel
2011/10/18 22:22:16
I tired to remove it, does not seem to work.
|
| + -webkit-box-orient: vertical; |
| + -webkit-user-select: none; |
| + display: -webkit-box; |
|
xiyuan
2011/10/15 15:56:19
"display: -webkit-box" + "-webkit-box-orient: vert
zel
2011/10/18 22:22:16
I tired to remove it, does not seem to work.
|
| + height: 100%; |
| + margin: 0; |
| + padding: 0; |
| + position: absolute; |
|
xiyuan
2011/10/15 15:56:19
We don't need this for body.
zel
2011/10/18 22:22:16
Done.
|
| + width: 100%; |
| } |
| +.dialog-body { |
| + border: 1px #aaa solid; |
| + border-radius: 4px; |
| + display: -webkit-box; |
| + margin: 15px; |
| + margin-top: 0; |
| + overflow: hidden; |
| + position: relative; |
| + -webkit-box-orient: horizontal; |
| + -webkit-box-flex: 1; |
|
xiyuan
2011/10/15 15:56:19
nit: move -webkit-xxx styles to block beginning?
zel
2011/10/18 22:22:16
I tired to remove it, does not seem to work.
|
| +} |
| + |
| iframe { |
| overflow-x: scroll; |
| overflow-y: scroll; |
| } |
| .overlay { |
| - position: fixed; |
| + position: absolute; |
| left: 0; |
| right: 0; |
| background: rgba(0, 0, 0, .1); |
| @@ -48,6 +65,10 @@ |
| #paymentForm { |
| display: -webkit-box; |
| + width: 100%; |
|
xiyuan
2011/10/15 15:56:19
do we need "height:100%" here?
zel
2011/10/18 22:22:16
nope, i think that the container div does the stre
|
| +} |
| + |
| +/* |
| position: absolute; |
| left: 0; |
| right: 0; |
| @@ -55,7 +76,7 @@ |
| bottom: 0; |
| width: 100%; |
| height: 100%; |
| -} |
| +*/ |
|
xiyuan
2011/10/15 15:56:19
get rid of unused styles?
zel
2011/10/18 22:22:16
Done.
|
| .logo { |
| background: url('chrome-extension://iadeocfgjdjdmpenejdbfeaocpbikmab/carrier_logo.png') no-repeat; |
| @@ -85,21 +106,6 @@ |
| padding-bottom: 50px; |
| } |
| -.action-area { |
| - -webkit-box-orient: horizontal; |
| - -webkit-box-align: center; |
| - padding: 12px; |
| - position: absolute; |
| - right: 0px; |
| - bottom: 0px; |
| - display: -webkit-box; |
| -} |
| - |
| -.button-strip { |
| - -webkit-box-orient: horizontal; |
| - display: -webkit-box; |
| -} |
| - |
| #carrierPage { |
| padding-top: 10px; |
| width: 500px; |
| @@ -153,14 +159,29 @@ |
| vertical-align: middle; |
| line-height: 0px; |
| } |
| +.dialog-footer { |
| + -webkit-box-orient: horizontal; |
| + display: -webkit-box; |
| + margin: 15px; |
| + margin-top: 0; |
| +} |
| + |
| +.horizontal-spacer { |
| + -webkit-box-orient: horizontal; |
| + -webkit-box-flex: 1; |
| + display: -webkit-box; |
|
xiyuan
2011/10/15 15:56:19
We don't need this unless horizontal-spacer has ch
zel
2011/10/18 22:22:16
Done.
|
| +} |
| </style> |
| +<link rel="stylesheet" href="chrome://resources/css/dialogs.css"></link> |
| <script src="chrome://resources/js/cr.js"></script> |
| <script src="chrome://resources/js/local_strings.js"></script> |
| <script src="chrome://resources/js/util.js"></script> |
| +<script src="chrome://resources/js/cr/ui/dialogs.js"></script> |
| <script src="mobile_setup.js"></script> |
| </head> |
| <body onload="mobile.MobileSetup.loadPage();" |
| i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> |
| + <div class="dialog-body"> |
| <iframe class="hidden" id="paymentForm" frameborder="0"></iframe> |
| <div id="systemStatus" class="overlay hidden"> |
| <div class="startup"> |
| @@ -186,11 +207,16 @@ |
| <div id="finalMessage"></div> |
| <div class="splitter"></div> |
| <div class="logo"></div> |
| - <div class="action-area button-strip"> |
| + <div class="button-strip"> |
| <button id="closeButton" |
| i18n-content="close_button" class="hidden"></button> |
| </div> |
| </div> |
| </div> |
| + </div> |
| + <div class="dialog-footer"> |
| + <div class=horizontal-spacer></div> |
| + <button id="cancelButton" class="cancel" i18n-content="cancel_button"></button> |
| + </div> |
| </body> |
| </html> |
