Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/assert.html"> | 1 <link rel="import" href="chrome://resources/html/assert.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/i18n_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/i18n_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="../i18n_setup.html"> | 5 <link rel="import" href="../i18n_setup.html"> |
| 6 <link rel="import" href="../icons.html"> | 6 <link rel="import" href="../icons.html"> |
| 7 <link rel="import" href="lock_screen_constants.html"> | 7 <link rel="import" href="lock_screen_constants.html"> |
| 8 <link rel="import" href="pin_keyboard.html"> | 8 <link rel="import" href="pin_keyboard.html"> |
| 9 <link rel="import" href="../settings_shared_css.html"> | 9 <link rel="import" href="../settings_shared_css.html"> |
| 10 | 10 |
| 11 <dom-module id="settings-setup-pin-dialog"> | 11 <dom-module id="settings-setup-pin-dialog"> |
| 12 <template> | 12 <template> |
| 13 <style include="settings-shared"></style> | 13 <style include="settings-shared"></style> |
| 14 <style> | 14 <style> |
| 15 .button-strip { | |
| 16 float: right; | |
| 17 } | |
|
stevenjb
2017/03/30 22:14:17
We should really really try to avoid 'float', we s
sammiequon
2017/03/30 22:53:34
This uses the text-align: end in shared-css now.
| |
| 18 | |
| 15 .warning { | 19 .warning { |
| 16 color: var(--paper-grey-700); | 20 color: var(--paper-grey-700); |
| 17 } | 21 } |
| 18 | 22 |
| 19 .warning > iron-icon { | 23 .warning > iron-icon { |
| 20 --iron-icon-fill-color: var(--paper-grey-700); | 24 --iron-icon-fill-color: var(--paper-grey-700); |
| 21 } | 25 } |
| 22 | 26 |
| 23 .error { | 27 .error { |
| 24 color: var(--paper-red-500); | 28 color: var(--paper-red-500); |
| 25 } | 29 } |
| 26 | 30 |
| 27 .error > iron-icon { | 31 .error > iron-icon { |
| 28 --iron-icon-fill-color: var(--paper-red-500); | 32 --iron-icon-fill-color: var(--paper-red-500); |
| 29 } | 33 } |
| 30 | 34 |
| 31 .align-center { | 35 .align-center { |
|
stevenjb
2017/03/30 22:14:17
Making flex part of a class named 'align-center' i
sammiequon
2017/03/30 22:53:34
This is no longer needed after removing </style><s
| |
| 36 display: flex; | |
| 32 justify-content: center; | 37 justify-content: center; |
| 33 } | 38 } |
| 34 </style> | 39 </style> |
| 35 | 40 |
| 36 <dialog is="cr-dialog" id="dialog" on-close="close" | 41 <dialog is="cr-dialog" id="dialog" on-close="close" |
| 37 close-text="$i18n{close}"> | 42 close-text="$i18n{close}"> |
| 38 <div class="title">[[getTitleMessage_(isConfirmStep_)]]</div> | 43 <div class="title">[[getTitleMessage_(isConfirmStep_)]]</div> |
| 39 <div class="body"> | 44 <div class="body"> |
| 40 <!-- Warning/error; only shown if title is hidden. Id is needed for | 45 <!-- Warning/error; only shown if title is hidden. Id is needed for |
| 41 tests. --> | 46 tests. --> |
| 42 <div id="problemDiv" class$="[[problemClass_]] settings-box first" | 47 <div id="problemDiv" class$="[[problemClass_]] settings-box first" |
| 43 hidden$="[[!hasProblem_(problemMessage_)]]"> | 48 hidden$="[[!hasProblem_(problemMessage_)]]"> |
| 44 <iron-icon icon="settings:warning"></iron-icon> | 49 <iron-icon icon="settings:warning"></iron-icon> |
| 45 <span class="middle">[[problemMessage_]]</span> | 50 <span class="middle">[[problemMessage_]]</span> |
| 46 </div> | 51 </div> |
| 47 | 52 |
| 48 <!-- Pin keyboard --> | 53 <!-- Pin keyboard --> |
| 49 <div class="align-center settings-box continuation"> | 54 <div class="align-center settings-box continuation"> |
| 50 <pin-keyboard id="pinKeyboard" on-pin-change="onPinChange_" | 55 <pin-keyboard id="pinKeyboard" on-pin-change="onPinChange_" |
| 51 on-submit="onPinSubmit_" value="{{pinKeyboardValue_}}"> | 56 on-submit="onPinSubmit_" value="{{pinKeyboardValue_}}"> |
| 52 </pin-keyboard> | 57 </pin-keyboard> |
| 53 </div> | 58 </div> |
| 54 | 59 |
| 55 <div class="button-strip"> | 60 <div class="button-strip"> |
| 56 <paper-button class="cancel-button" on-tap="onCancelTap_"> | 61 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
| 57 $i18n{cancel} | 62 $i18n{cancel} |
| 58 </paper-button> | 63 </paper-button> |
| 59 | 64 |
| 60 <paper-button class="action-button" on-tap="onPinSubmit_" | 65 <paper-button class="action-button" on-tap="onPinSubmit_" |
| 61 disabled$="[[!enableSubmit_]]"> | 66 disabled$="[[!enableSubmit_]]"> |
| 62 <span>[[getContinueMessage_(isConfirmStep_)]]</span> | 67 <span>[[getContinueMessage_(isConfirmStep_)]]</span> |
| 63 </paper-button> | 68 </paper-button> |
| 64 </div> | 69 </div> |
| 65 </div> | 70 </div> |
| 66 </dialog> | 71 </dialog> |
| 67 </template> | 72 </template> |
| 68 | 73 |
| 69 <script src="setup_pin_dialog.js"></script> | 74 <script src="setup_pin_dialog.js"></script> |
| 70 </dom-module> | 75 </dom-module> |
| OLD | NEW |