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

Side by Side Diff: chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html

Issue 2795763003: MD Settings: adjust dialog style and scroll border visual (Closed)
Patch Set: modify cups dialog button to align by flexbox Created 3 years, 8 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
OLDNEW
1 <link rel="import" href="chrome://resources/html/md_select_css.html"> 1 <link rel="import" href="chrome://resources/html/md_select_css.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
7 <link rel="import" href="../i18n_setup.html"> 7 <link rel="import" href="../i18n_setup.html">
8 <link rel="import" href="cups_add_printer_dialog_util.html"> 8 <link rel="import" href="cups_add_printer_dialog_util.html">
9 <link rel="import" href="cups_printers_browser_proxy.html"> 9 <link rel="import" href="cups_printers_browser_proxy.html">
10 <link rel="import" href="../settings_shared_css.html"> 10 <link rel="import" href="../settings_shared_css.html">
(...skipping 23 matching lines...) Expand all
34 } 34 }
35 35
36 #searchSpinner paper-spinner { 36 #searchSpinner paper-spinner {
37 --paper-spinner-stroke-width: 2px; 37 --paper-spinner-stroke-width: 2px;
38 -webkit-margin-end: 3px; 38 -webkit-margin-end: 3px;
39 -webkit-margin-start: 20px; 39 -webkit-margin-start: 20px;
40 height: 15px; 40 height: 15px;
41 width: 15px; 41 width: 15px;
42 } 42 }
43 43
44 #manuallyAddPrinterButton { 44 .dialog-buttons {
45 -webkit-margin-end: 210px; 45 display: flex;
46 justify-content: space-between;
47 width: 100%;
46 } 48 }
47 </style> 49 </style>
48 <add-printer-dialog> 50 <add-printer-dialog>
49 <div class="dialog-title">$i18n{addPrintersNearbyTitle}</div> 51 <div class="dialog-title">$i18n{addPrintersNearbyTitle}</div>
50 <div class="dialog-body"> 52 <div class="dialog-body">
51 <add-printer-list printers="[[discoveredPrinters]]" 53 <add-printer-list printers="[[discoveredPrinters]]"
52 selected-printer="{{selectedPrinter}}"> 54 selected-printer="{{selectedPrinter}}">
53 </add-printer-list> 55 </add-printer-list>
54 <div class="center" id="noPrinterMessage" hidden> 56 <div class="center" id="noPrinterMessage" hidden>
55 $i18n{noPrinterNearbyMessage} 57 $i18n{noPrinterNearbyMessage}
56 </div> 58 </div>
57 <div id="searchSpinner" hidden="[[!discovering_]]"> 59 <div id="searchSpinner" hidden="[[!discovering_]]">
58 <paper-spinner active="[[discovering_]]"></paper-spinner> 60 <paper-spinner active="[[discovering_]]"></paper-spinner>
59 <span>$i18n{searchingNearbyPrinters}</span> 61 <span>$i18n{searchingNearbyPrinters}</span>
60 </div> 62 </div>
61 </div> 63 </div>
62 <div class="dialog-buttons"> 64 <div class="dialog-buttons">
63 <paper-button id="manuallyAddPrinterButton" 65 <div> <!-- Left group -->
64 on-tap="switchToManualAddDialog_"> 66 <paper-button id="manuallyAddPrinterButton" class="secondary-button"
65 $i18n{manuallyAddPrinterButtonText} 67 on-tap="switchToManualAddDialog_">
66 </paper-button> 68 $i18n{manuallyAddPrinterButtonText}
67 <paper-button class="cancel-button" on-tap="onCancelTap_"> 69 </paper-button>
68 $i18n{cancelButtonText} 70 </div>
69 </paper-button> 71 <div> <!-- Right group -->
70 <paper-button class="action-button" id="addPrinterButton" 72 <paper-button class="cancel-button secondary-button"
71 disabled="[[!selectedPrinter]]" on-tap="switchToConfiguringDialog_"> 73 on-tap="onCancelTap_">
72 $i18n{addPrinterButtonText} 74 $i18n{cancelButtonText}
73 </paper-button> 75 </paper-button>
76 <paper-button class="action-button" id="addPrinterButton"
77 disabled="[[!selectedPrinter]]"
78 on-tap="switchToConfiguringDialog_">
79 $i18n{addPrinterButtonText}
80 </paper-button>
81 </div>
74 </div> 82 </div>
75 </add-printer-dialog> 83 </add-printer-dialog>
76 </template> 84 </template>
77 </dom-module> 85 </dom-module>
78 86
79 <dom-module id="add-printer-manually-dialog"> 87 <dom-module id="add-printer-manually-dialog">
80 <template> 88 <template>
81 <style include="settings-shared md-select"> 89 <style include="settings-shared md-select">
82 #discoverPrintersButton { 90 #discoverPrintersButton {
83 -webkit-margin-end: 153px; 91 -webkit-margin-end: 153px;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 </div> 202 </div>
195 <div class="search-printer-box printer-not-found" 203 <div class="search-printer-box printer-not-found"
196 id="searchNotFound" hidden> 204 id="searchNotFound" hidden>
197 <span>$i18n{printerNotFound}</span> 205 <span>$i18n{printerNotFound}</span>
198 </div> 206 </div>
199 <div class="search-printer-box printer-found" id="searchFound" hidden> 207 <div class="search-printer-box printer-found" id="searchFound" hidden>
200 <span>$i18n{printerFound}</span> 208 <span>$i18n{printerFound}</span>
201 </div> 209 </div>
202 </div> 210 </div>
203 <div class="dialog-buttons"> 211 <div class="dialog-buttons">
204 <paper-button class="cancel-button" on-tap="onCancelTap_"> 212 <paper-button class="cancel-button secondary-button"
213 on-tap="onCancelTap_">
205 $i18n{cancelButtonText} 214 $i18n{cancelButtonText}
206 </paper-button> 215 </paper-button>
207 <paper-button class="action-button" on-tap="switchToManufacturerDialog_" 216 <paper-button class="action-button" on-tap="switchToManufacturerDialog_"
208 disabled="[[!newPrinter.printerName]]"> 217 disabled="[[!newPrinter.printerName]]">
209 $i18n{addPrinterButtonText} 218 $i18n{addPrinterButtonText}
210 </paper-button> 219 </paper-button>
211 </div> 220 </div>
212 </add-printer-dialog> 221 </add-printer-dialog>
213 </template> 222 </template>
214 </dom-module> 223 </dom-module>
(...skipping 29 matching lines...) Expand all
244 width: 340px; 253 width: 340px;
245 } 254 }
246 255
247 .error-message { 256 .error-message {
248 background-color: var(--google-red-100); 257 background-color: var(--google-red-100);
249 color: red; 258 color: red;
250 margin-top: 10px; 259 margin-top: 10px;
251 padding: 10px 20px; 260 padding: 10px 20px;
252 } 261 }
253 262
254 #manuallyAddPrinterButton { 263 .dialog-buttons {
255 -webkit-margin-end: 210px; 264 display: flex;
265 justify-content: space-between;
266 width: 100%;
256 } 267 }
257 268
258 #browseButton { 269 #browseButton {
259 color: black; 270 color: black;
260 font-size: inherit; 271 font-size: inherit;
261 } 272 }
262 </style> 273 </style>
263 <add-printer-dialog> 274 <add-printer-dialog>
264 <div class="dialog-title">$i18n{addPrintersManuallyTitle}</div> 275 <div class="dialog-title">$i18n{addPrintersManuallyTitle}</div>
265 <div class="dialog-body"> 276 <div class="dialog-body">
(...skipping 30 matching lines...) Expand all
296 </paper-button> 307 </paper-button>
297 </paper-input> 308 </paper-input>
298 </div> 309 </div>
299 </div> 310 </div>
300 </div> 311 </div>
301 <div class="error-message" hidden="[[!setupFailed]]"> 312 <div class="error-message" hidden="[[!setupFailed]]">
302 Driver not found (exact error message TBD) 313 Driver not found (exact error message TBD)
303 </div> 314 </div>
304 </div> 315 </div>
305 <div class="dialog-buttons"> 316 <div class="dialog-buttons">
306 <paper-button id="manuallyAddPrinterButton" 317 <div> <!-- Left group -->
307 on-tap="switchToManualAddDialog_"> 318 <paper-button id="manuallyAddPrinterButton" class="secondary-button"
308 $i18n{manuallyAddPrinterButtonText} 319 on-tap="switchToManualAddDialog_">
309 </paper-button> 320 $i18n{manuallyAddPrinterButtonText}
310 <paper-button class="cancel-button" on-tap="onCancelTap_"> 321 </paper-button>
311 $i18n{cancelButtonText} 322 </div>
312 </paper-button> 323 <div> <!-- Right group -->
313 <paper-button class="action-button" id="addPrinterButton" 324 <paper-button class="cancel-button secondary-button"
314 on-tap="switchToConfiguringDialog_"> 325 on-tap="onCancelTap_">
315 $i18n{addPrinterButtonText} 326 $i18n{cancelButtonText}
316 </paper-button> 327 </paper-button>
328 <paper-button class="action-button" id="addPrinterButton"
329 on-tap="switchToConfiguringDialog_">
330 $i18n{addPrinterButtonText}
331 </paper-button>
332 </div>
317 </div> 333 </div>
318 </add-printer-dialog> 334 </add-printer-dialog>
319 </template> 335 </template>
320 </dom-module> 336 </dom-module>
321 337
322 <dom-module id="add-printer-configuring-dialog"> 338 <dom-module id="add-printer-configuring-dialog">
323 <template> 339 <template>
324 <style include="settings-shared"> 340 <style include="settings-shared">
325 .dialog-body { 341 .dialog-body {
326 padding-top: 140px; 342 padding-top: 140px;
327 text-align: center; 343 text-align: center;
328 } 344 }
329 </style> 345 </style>
330 <add-printer-dialog> 346 <add-printer-dialog>
331 <div class="dialog-title">[[dialogTitle]]</div> 347 <div class="dialog-title">[[dialogTitle]]</div>
332 <div class="dialog-body"> 348 <div class="dialog-body">
333 <paper-spinner active></paper-spinner> 349 <paper-spinner active></paper-spinner>
334 <div id="configuringMessage">$i18n{printerConfiguringMessage}</div> 350 <div id="configuringMessage">$i18n{printerConfiguringMessage}</div>
335 </div> 351 </div>
336 <div class="dialog-buttons"> 352 <div class="dialog-buttons">
337 <paper-button class="cancel-button" on-tap="onCancelConfiguringTap_"> 353 <paper-button class="cancel-button secondary-button"
354 on-tap="onCancelConfiguringTap_">
338 $i18n{cancelButtonText} 355 $i18n{cancelButtonText}
339 </paper-button> 356 </paper-button>
340 </div> 357 </div>
341 </add-printer-dialog> 358 </add-printer-dialog>
342 </template> 359 </template>
343 </dom-module> 360 </dom-module>
344 361
345 <dom-module id="settings-cups-add-printer-dialog"> 362 <dom-module id="settings-cups-add-printer-dialog">
346 <template> 363 <template>
347 <style include="settings-shared"></style> 364 <style include="settings-shared"></style>
(...skipping 21 matching lines...) Expand all
369 <!-- Manufacturer and Model Dialog --> 386 <!-- Manufacturer and Model Dialog -->
370 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> 387 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp>
371 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}" 388 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}"
372 setup-failed="[[setupFailed]]"> 389 setup-failed="[[setupFailed]]">
373 </add-printer-manufacturer-model-dialog> 390 </add-printer-manufacturer-model-dialog>
374 </template> 391 </template>
375 392
376 </template> 393 </template>
377 <script src="cups_add_printer_dialog.js"></script> 394 <script src="cups_add_printer_dialog.js"></script>
378 </dom-module> 395 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698