Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/action_link.html"> | 1 <link rel="import" href="chrome://resources/html/action_link.html"> |
| 2 <link rel="import" href="chrome://resources/html/action_link_css.html"> | 2 <link rel="import" href="chrome://resources/html/action_link_css.html"> |
| 3 <link rel="import" href="chrome://resources/html/assert.html"> | 3 <link rel="import" href="chrome://resources/html/assert.html"> |
| 4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> |
| 5 <link rel="import" href="chrome://resources/html/polymer.html"> | 5 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | |
| 6 <link rel="import" href="cups_add_printer_dialog.html"> | 7 <link rel="import" href="cups_add_printer_dialog.html"> |
| 7 <link rel="import" href="cups_printers_list.html"> | 8 <link rel="import" href="cups_printers_list.html"> |
| 8 <link rel="import" href="../settings_shared_css.html"> | 9 <link rel="import" href="../settings_shared_css.html"> |
| 9 | 10 |
| 10 <dom-module id="settings-cups-printers"> | 11 <dom-module id="settings-cups-printers"> |
| 11 <template> | 12 <template> |
| 12 <style include="settings-shared action-link"> | 13 <style include="settings-shared action-link"> |
| 13 .settings-box .start { | 14 .settings-box .start { |
| 14 color: var(--paper-grey-600); | 15 color: var(--paper-grey-600); |
| 15 } | 16 } |
| 16 | 17 |
| 17 .settings-box .start .secondary { | 18 .settings-box .start .secondary { |
| 18 color: var(--paper-grey-800); | 19 color: var(--paper-grey-800); |
| 19 font-size: 92.31%; /* 12px / 13px */ | 20 font-size: 92.31%; /* 12px / 13px */ |
| 20 } | 21 } |
| 22 | |
| 23 paper-button { | |
|
michaelpg
2017/05/05 22:53:38
What does this do differently that it needs to loo
xdai1
2017/05/06 00:02:42
I didn't notice that there was pre-defined "primar
michaelpg
2017/05/06 01:21:50
try -webkit-margin-start: auto instead of margin-l
xdai1
2017/05/08 17:20:42
It worked, thanks a lot!
| |
| 24 --paper-button-flat-keyboard-focus: { | |
| 25 font-weight: 500; | |
| 26 }; | |
| 27 color: var(--google-blue-500); | |
| 28 font-weight: 500; | |
| 29 margin-left: auto; | |
| 30 } | |
| 21 | 31 |
| 22 #message { | 32 #message { |
| 23 display: flex; | 33 display: flex; |
| 24 justify-content: center; | 34 justify-content: center; |
| 25 position: absolute; | 35 position: absolute; |
| 26 top: 85%; | 36 top: 85%; |
| 27 width: 100%; | 37 width: 100%; |
| 28 } | 38 } |
| 29 | 39 |
| 30 .center { | 40 .center { |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 41 display: flex; | 51 display: flex; |
| 42 justify-content: space-around; | 52 justify-content: space-around; |
| 43 } | 53 } |
| 44 | 54 |
| 45 #addPrinterErrorMessage a[is='action-link'] { | 55 #addPrinterErrorMessage a[is='action-link'] { |
| 46 text-transform: uppercase; | 56 text-transform: uppercase; |
| 47 } | 57 } |
| 48 </style> | 58 </style> |
| 49 | 59 |
| 50 <div class="settings-box first"> | 60 <div class="settings-box first"> |
| 51 <a id="addPrinter" is="action-link" on-tap="onAddPrinterTap_" | 61 <paper-button id="addPrinter" on-tap="onAddPrinterTap_" |
| 52 hidden="[[!canAddPrinter_]]"> | 62 hidden="[[!canAddPrinter_]]"> |
| 53 $i18n{addCupsPrinter} | 63 $i18n{addCupsPrinter} |
| 54 </a> | 64 </paper-button> |
| 55 <div class="start" hidden="[[canAddPrinter_]]"> | 65 <div class="start" hidden="[[canAddPrinter_]]"> |
| 56 <span>$i18n{addCupsPrinter}</span> | 66 <span>$i18n{addCupsPrinter}</span> |
| 57 <div class="secondary"> | 67 <div class="secondary">$i18n{requireNetworkMessage}</div> |
| 58 $i18n{requireNetworkMessage} | |
| 59 </div> | |
| 60 </div> | 68 </div> |
| 61 </div> | 69 </div> |
| 62 | 70 |
| 63 <settings-cups-add-printer-dialog id="addPrinterDialog" | 71 <settings-cups-add-printer-dialog id="addPrinterDialog" |
| 64 on-close="onAddPrinterDialogClose_"> | 72 on-close="onAddPrinterDialogClose_"> |
| 65 </settings-cups-add-printer-dialog> | 73 </settings-cups-add-printer-dialog> |
| 66 | 74 |
| 67 <settings-cups-printers-list printers="{{printers}}" | 75 <settings-cups-printers-list printers="{{printers}}" |
| 68 search-term="[[searchTerm]]"> | 76 search-term="[[searchTerm]]"> |
| 69 </settings-cups-printers-list> | 77 </settings-cups-printers-list> |
| 70 | 78 |
| 71 <div id="message"> | 79 <div id="message"> |
| 72 <div class="center" id="addPrinterDoneMessage" hidden> | 80 <div class="center" id="addPrinterDoneMessage" hidden> |
| 73 $i18n{printerAddedSuccessfulMessage} | 81 $i18n{printerAddedSuccessfulMessage} |
| 74 </div> | 82 </div> |
| 75 <div class="center" id="addPrinterErrorMessage" hidden> | 83 <div class="center" id="addPrinterErrorMessage" hidden> |
| 76 <span>$i18n{printerAddedFailedMessage}</span> | 84 <span>$i18n{printerAddedFailedMessage}</span> |
| 77 <a is="action-link" on-tap="onAddPrinterTap_"> | 85 <a is="action-link" on-tap="onAddPrinterTap_"> |
| 78 $i18n{printerAddedTryAgainMessage} | 86 $i18n{printerAddedTryAgainMessage} |
| 79 </a> | 87 </a> |
| 80 </div> | 88 </div> |
| 81 </div> | 89 </div> |
| 82 </template> | 90 </template> |
| 83 <script src="cups_printers.js"></script> | 91 <script src="cups_printers.js"></script> |
| 84 </dom-module> | 92 </dom-module> |
| OLD | NEW |