| Index: chrome/browser/resources/mobile_setup.html
|
| ===================================================================
|
| --- chrome/browser/resources/mobile_setup.html (revision 106917)
|
| +++ 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;
|
| + -webkit-box-orient: vertical;
|
| + -webkit-user-select: none;
|
| + display: -webkit-box;
|
| + height: 100%;
|
| + margin: 0;
|
| + padding: 0;
|
| + position: absolute;
|
| + 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;
|
| +}
|
| +
|
| iframe {
|
| overflow-x: scroll;
|
| overflow-y: scroll;
|
| }
|
|
|
| .overlay {
|
| - position: fixed;
|
| + position: absolute;
|
| left: 0;
|
| right: 0;
|
| background: rgba(0, 0, 0, .1);
|
| @@ -48,13 +65,7 @@
|
|
|
| #paymentForm {
|
| display: -webkit-box;
|
| - position: absolute;
|
| - left: 0;
|
| - right: 0;
|
| - top: 0;
|
| - bottom: 0;
|
| width: 100%;
|
| - height: 100%;
|
| }
|
|
|
| .logo {
|
| @@ -85,21 +96,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 +149,28 @@
|
| 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;
|
| +}
|
| </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 +196,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>
|
|
|
Chromium Code Reviews
Issue 8271025:
Moved mobile activation into its own modal dialog (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/