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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/mobile_setup.html

Issue 8271025: Moved mobile activation into its own modal dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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
« chrome/browser/resources/file_manager/js/dialogs.js ('K') | « chrome/browser/resources/file_manager/main.html ('k') | chrome/browser/resources/mobile_setup.js » ('j') | chrome/browser/resources/mobile_setup.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5 <title i18n-content="title"></title> 5 <title i18n-content="title"></title>
6 <style> 6 <style>
7 body { 7 body {
8 font-family: arial, sans-serif; 8 -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.
9 font-size: 13px; 9 -webkit-box-orient: vertical;
10 line-height: 22px; 10 -webkit-user-select: none;
11 -webkit-user-select: none; 11 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.
12 height: 100%;
13 margin: 0;
14 padding: 0;
15 position: absolute;
xiyuan 2011/10/15 15:56:19 We don't need this for body.
zel 2011/10/18 22:22:16 Done.
16 width: 100%;
17 }
18
19 .dialog-body {
20 border: 1px #aaa solid;
21 border-radius: 4px;
22 display: -webkit-box;
23 margin: 15px;
24 margin-top: 0;
25 overflow: hidden;
26 position: relative;
27 -webkit-box-orient: horizontal;
28 -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.
12 } 29 }
13 30
14 iframe { 31 iframe {
15 overflow-x: scroll; 32 overflow-x: scroll;
16 overflow-y: scroll; 33 overflow-y: scroll;
17 } 34 }
18 35
19 .overlay { 36 .overlay {
20 position: fixed; 37 position: absolute;
21 left: 0; 38 left: 0;
22 right: 0; 39 right: 0;
23 background: rgba(0, 0, 0, .1); 40 background: rgba(0, 0, 0, .1);
24 top: 0; 41 top: 0;
25 bottom: 0; 42 bottom: 0;
26 z-index: 10; 43 z-index: 10;
27 padding: 100px; 44 padding: 100px;
28 -webkit-box-align: center; 45 -webkit-box-align: center;
29 -webkit-box-pack: center; 46 -webkit-box-pack: center;
30 } 47 }
(...skipping 10 matching lines...) Expand all
41 width: 500px; 58 width: 500px;
42 position: absolute; 59 position: absolute;
43 top: 50%; 60 top: 50%;
44 left: 50%; 61 left: 50%;
45 margin-left:-250px; 62 margin-left:-250px;
46 margin-top:-250px; 63 margin-top:-250px;
47 } 64 }
48 65
49 #paymentForm { 66 #paymentForm {
50 display: -webkit-box; 67 display: -webkit-box;
68 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
69 }
70
71 /*
51 position: absolute; 72 position: absolute;
52 left: 0; 73 left: 0;
53 right: 0; 74 right: 0;
54 top: 0; 75 top: 0;
55 bottom: 0; 76 bottom: 0;
56 width: 100%; 77 width: 100%;
57 height: 100%; 78 height: 100%;
58 } 79 */
xiyuan 2011/10/15 15:56:19 get rid of unused styles?
zel 2011/10/18 22:22:16 Done.
59 80
60 .logo { 81 .logo {
61 background: url('chrome-extension://iadeocfgjdjdmpenejdbfeaocpbikmab/carrier_l ogo.png') no-repeat; 82 background: url('chrome-extension://iadeocfgjdjdmpenejdbfeaocpbikmab/carrier_l ogo.png') no-repeat;
62 background-position: 85% 50%; 83 background-position: 85% 50%;
63 height: 58px; 84 height: 58px;
64 margin-bottom: 20px; 85 margin-bottom: 20px;
65 margin-top: 20px; 86 margin-top: 20px;
66 } 87 }
67 88
68 .splitter { 89 .splitter {
69 margin-top: 10px; 90 margin-top: 10px;
70 border-bottom: 1px solid #EEE; 91 border-bottom: 1px solid #EEE;
71 height: 1px; 92 height: 1px;
72 } 93 }
73 94
74 .hidden { 95 .hidden {
75 display: none; 96 display: none;
76 } 97 }
77 98
78 .testing-only { 99 .testing-only {
79 position: absolute; 100 position: absolute;
80 left: 0; 101 left: 0;
81 top: 0; 102 top: 0;
82 } 103 }
83 104
84 #finalMessage { 105 #finalMessage {
85 padding-bottom: 50px; 106 padding-bottom: 50px;
86 } 107 }
87 108
88 .action-area {
89 -webkit-box-orient: horizontal;
90 -webkit-box-align: center;
91 padding: 12px;
92 position: absolute;
93 right: 0px;
94 bottom: 0px;
95 display: -webkit-box;
96 }
97
98 .button-strip {
99 -webkit-box-orient: horizontal;
100 display: -webkit-box;
101 }
102
103 #carrierPage { 109 #carrierPage {
104 padding-top: 10px; 110 padding-top: 10px;
105 width: 500px; 111 width: 500px;
106 height: 380px; 112 height: 380px;
107 overflow-x: none; 113 overflow-x: none;
108 overflow-y: none; 114 overflow-y: none;
109 } 115 }
110 116
111 #header { 117 #header {
112 -webkit-padding-start: 50px; 118 -webkit-padding-start: 50px;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 height: 380px; 152 height: 380px;
147 padding-top: 20px; 153 padding-top: 20px;
148 } 154 }
149 .headerCell { 155 .headerCell {
150 -webkit-padding-start: 10px; 156 -webkit-padding-start: 10px;
151 } 157 }
152 .canvasCell { 158 .canvasCell {
153 vertical-align: middle; 159 vertical-align: middle;
154 line-height: 0px; 160 line-height: 0px;
155 } 161 }
162 .dialog-footer {
163 -webkit-box-orient: horizontal;
164 display: -webkit-box;
165 margin: 15px;
166 margin-top: 0;
167 }
168
169 .horizontal-spacer {
170 -webkit-box-orient: horizontal;
171 -webkit-box-flex: 1;
172 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.
173 }
156 </style> 174 </style>
175 <link rel="stylesheet" href="chrome://resources/css/dialogs.css"></link>
157 <script src="chrome://resources/js/cr.js"></script> 176 <script src="chrome://resources/js/cr.js"></script>
158 <script src="chrome://resources/js/local_strings.js"></script> 177 <script src="chrome://resources/js/local_strings.js"></script>
159 <script src="chrome://resources/js/util.js"></script> 178 <script src="chrome://resources/js/util.js"></script>
179 <script src="chrome://resources/js/cr/ui/dialogs.js"></script>
160 <script src="mobile_setup.js"></script> 180 <script src="mobile_setup.js"></script>
161 </head> 181 </head>
162 <body onload="mobile.MobileSetup.loadPage();" 182 <body onload="mobile.MobileSetup.loadPage();"
163 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 183 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
184 <div class="dialog-body">
164 <iframe class="hidden" id="paymentForm" frameborder="0"></iframe> 185 <iframe class="hidden" id="paymentForm" frameborder="0"></iframe>
165 <div id="systemStatus" class="overlay hidden"> 186 <div id="systemStatus" class="overlay hidden">
166 <div class="startup"> 187 <div class="startup">
167 <div id="banner"> 188 <div id="banner">
168 <table border="0"> 189 <table border="0">
169 <tbody><tr> 190 <tbody><tr>
170 <td class="canvasCell"><canvas id="canvas" width="56" 191 <td class="canvasCell"><canvas id="canvas" width="56"
171 height="56"></canvas></td> 192 height="56"></canvas></td>
172 <td class="headerCell"> 193 <td class="headerCell">
173 <div id="statusHeader"></div> 194 <div id="statusHeader"></div>
174 <div id="auxHeader"></div> 195 <div id="auxHeader"></div>
175 </td> 196 </td>
176 </tr> 197 </tr>
177 </tbody></table> 198 </tbody></table>
178 </div> 199 </div>
179 <iframe src="chrome-extension://iadeocfgjdjdmpenejdbfeaocpbikmab/activatio n.html" 200 <iframe src="chrome-extension://iadeocfgjdjdmpenejdbfeaocpbikmab/activatio n.html"
180 id="carrierPage" frameborder="0"></iframe> 201 id="carrierPage" frameborder="0"></iframe>
181 </div> 202 </div>
182 </div> 203 </div>
183 <div id="finalStatus" class="overlay hidden"> 204 <div id="finalStatus" class="overlay hidden">
184 <div class="startup"> 205 <div class="startup">
185 <div class="header"><h3 id="finalHeader"></h3></div> 206 <div class="header"><h3 id="finalHeader"></h3></div>
186 <div id="finalMessage"></div> 207 <div id="finalMessage"></div>
187 <div class="splitter"></div> 208 <div class="splitter"></div>
188 <div class="logo"></div> 209 <div class="logo"></div>
189 <div class="action-area button-strip"> 210 <div class="button-strip">
190 <button id="closeButton" 211 <button id="closeButton"
191 i18n-content="close_button" class="hidden"></button> 212 i18n-content="close_button" class="hidden"></button>
192 </div> 213 </div>
193 </div> 214 </div>
194 </div> 215 </div>
216 </div>
217 <div class="dialog-footer">
218 <div class=horizontal-spacer></div>
219 <button id="cancelButton" class="cancel" i18n-content="cancel_button"></butto n>
220 </div>
195 </body> 221 </body>
196 </html> 222 </html>
OLDNEW
« chrome/browser/resources/file_manager/js/dialogs.js ('K') | « chrome/browser/resources/file_manager/main.html ('k') | chrome/browser/resources/mobile_setup.js » ('j') | chrome/browser/resources/mobile_setup.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698