Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 | 2 |
| 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 4 <link rel="import" href="chrome://resources/html/assert.html"> | 4 <link rel="import" href="chrome://resources/html/assert.html"> |
| 5 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 5 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> |
| 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> | 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> |
| 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html"> | 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html"> |
| 13 <link rel="import" href="fingerprint_browser_proxy.html"> | 13 <link rel="import" href="fingerprint_browser_proxy.html"> |
| 14 <link rel="import" href="setup_fingerprint_dialog.html"> | 14 <link rel="import" href="setup_fingerprint_dialog.html"> |
| 15 <link rel="import" href="../i18n_setup.html"> | 15 <link rel="import" href="../i18n_setup.html"> |
| 16 <link rel="import" href="../route.html"> | 16 <link rel="import" href="../route.html"> |
| 17 <link rel="import" href="../settings_shared_css.html"> | 17 <link rel="import" href="../settings_shared_css.html"> |
| 18 | 18 |
| 19 <dom-module id="settings-fingerprint-list"> | 19 <dom-module id="settings-fingerprint-list"> |
| 20 <template> | 20 <template> |
| 21 <style include="settings-shared"> | 21 <style include="settings-shared"> |
| 22 .add-link { | 22 .add-link { |
| 23 background-color: transparent; | 23 background-color: transparent; |
| 24 color: var(--google-blue-500); | 24 color: var(--google-blue-500); |
| 25 padding: 0; | 25 } |
| 26 | |
| 27 .add-link[focused] { | |
| 28 color: white; | |
| 26 } | 29 } |
|
dschuyler
2017/06/06 18:58:39
This may be a fine change, but I'm missing how it
scottchen
2017/06/06 22:33:12
It's not related, I'll remove it from this CL for
| |
| 27 | 30 |
| 28 .add-link[disabled] { | 31 .add-link[disabled] { |
| 29 color: var(--google-grey-500); | 32 color: var(--google-grey-500); |
| 30 } | 33 } |
| 31 | 34 |
| 32 .body { | 35 .body { |
| 33 @apply(--settings-list-frame-padding); | 36 @apply(--settings-list-frame-padding); |
| 34 } | 37 } |
| 35 | 38 |
| 36 .list-item { | 39 .list-item { |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 48 | 51 |
| 49 <h2 class="settings-box">$i18n{lockScreenRegisteredFingerprints}</h2> | 52 <h2 class="settings-box">$i18n{lockScreenRegisteredFingerprints}</h2> |
| 50 <div class="body layout vertical"> | 53 <div class="body layout vertical"> |
| 51 <iron-list id="fingerprintsList" items="[[fingerprints_]]"> | 54 <iron-list id="fingerprintsList" items="[[fingerprints_]]"> |
| 52 <template> | 55 <template> |
| 53 <div class="list-item"> | 56 <div class="list-item"> |
| 54 <paper-ripple noink></paper-ripple> | 57 <paper-ripple noink></paper-ripple> |
| 55 <paper-input value="{{item}}" | 58 <paper-input value="{{item}}" |
| 56 on-change="onFingerprintLabelChanged_"> | 59 on-change="onFingerprintLabelChanged_"> |
| 57 </paper-input> | 60 </paper-input> |
| 58 <button is="paper-icon-button-light" | 61 <button is="paper-icon-button-light" class="icon-delete" |
| 59 on-tap="onFingerprintDeleteTapped_"> | 62 on-tap="onFingerprintDeleteTapped_"> |
| 60 <iron-icon icon="cr:delete"></iron-icon> | |
| 61 </button> | 63 </button> |
| 62 </div> | 64 </div> |
| 63 </template> | 65 </template> |
| 64 </iron-list> | 66 </iron-list> |
| 65 <div class="continuation"> | 67 <div class="continuation"> |
| 66 <paper-button id="addFingerprint" class="add-link action-button" | 68 <paper-button id="addFingerprint" class="add-link action-button" |
| 67 on-tap="openAddFingerprintDialog_"> | 69 on-tap="openAddFingerprintDialog_"> |
| 68 $i18n{lockScreenAddFingerprint} | 70 $i18n{lockScreenAddFingerprint} |
| 69 </paper-button> | 71 </paper-button> |
| 70 </div> | 72 </div> |
| 71 </div> | 73 </div> |
| 72 <i class="settings-box continuation">$i18n{lockScreenFingerprintWarning}</i> | 74 <i class="settings-box continuation">$i18n{lockScreenFingerprintWarning}</i> |
| 73 | 75 |
| 74 <template is="dom-if" if="[[showSetupFingerprintDialog_]]" restamp> | 76 <template is="dom-if" if="[[showSetupFingerprintDialog_]]" restamp> |
| 75 <settings-setup-fingerprint-dialog | 77 <settings-setup-fingerprint-dialog |
| 76 on-add-fingerprint="updateFingerprintsList_" | 78 on-add-fingerprint="updateFingerprintsList_" |
| 77 on-close="onSetupFingerprintDialogClose_"> | 79 on-close="onSetupFingerprintDialogClose_"> |
| 78 </settings-setup-fingerprint-dialog> | 80 </settings-setup-fingerprint-dialog> |
| 79 </template> | 81 </template> |
| 80 </template> | 82 </template> |
| 81 <script src="fingerprint_list.js"></script> | 83 <script src="fingerprint_list.js"></script> |
| 82 </dom-module> | 84 </dom-module> |
| OLD | NEW |