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 <link rel="import" href="chrome://resources/html/action_link.html"> | 2 <link rel="import" href="chrome://resources/html/action_link.html"> |
| 3 <link rel="import" href="chrome://resources/html/action_link_css.html"> | 3 <link rel="import" href="chrome://resources/html/action_link_css.html"> |
| 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html"> |
| 8 <link rel="import" href="../controls/settings_toggle_button.html"> | 8 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 9 <link rel="import" href="easy_unlock_browser_proxy.html"> | 9 <link rel="import" href="easy_unlock_browser_proxy.html"> |
| 10 <link rel="import" href="easy_unlock_turn_off_dialog.html"> | 10 <link rel="import" href="easy_unlock_turn_off_dialog.html"> |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 #easyUnlock .start { | 25 #easyUnlock .start { |
| 26 /* When the easy unlock toggle is shown, the easy unlock section's | 26 /* When the easy unlock toggle is shown, the easy unlock section's |
| 27 * content becomes squashed to the top and bottom edges. Use padding to | 27 * content becomes squashed to the top and bottom edges. Use padding to |
| 28 * ensure the easy unlock content looks correct. */ | 28 * ensure the easy unlock content looks correct. */ |
| 29 padding: 11px 0; | 29 padding: 11px 0; |
| 30 } | 30 } |
| 31 | 31 |
| 32 .radio-indent { | 32 .radio-indent { |
| 33 -webkit-margin-start: 36px; | 33 -webkit-margin-start: 36px; |
| 34 } | 34 } |
| 35 | |
| 36 #setupPinLink:focus { | |
| 37 font-weight: bold; | |
| 38 outline: 0; | |
| 39 } | |
| 35 </style> | 40 </style> |
| 36 | 41 |
| 37 <div> | 42 <div> |
| 38 <div class="list-frame"> | 43 <div class="list-frame"> |
| 39 <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> | 44 <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> |
| 40 <paper-radio-button name="password"> | 45 <paper-radio-button name="password"> |
| 41 $i18n{lockScreenPasswordOnly} | 46 $i18n{lockScreenPasswordOnly} |
| 42 </paper-radio-button> | 47 </paper-radio-button> |
| 43 <paper-radio-button name="pin+password"> | 48 <paper-radio-button name="pin+password"> |
| 44 $i18n{lockScreenPinOrPassword} | 49 $i18n{lockScreenPinOrPassword} |
| 45 </paper-radio-button> | 50 </paper-radio-button> |
| 46 </paper-radio-group> | 51 </paper-radio-group> |
| 47 <div class="list-item radio-indent" | 52 <div class="list-item radio-indent" |
| 48 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]"> | 53 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]"> |
| 49 <a id="setupPinLink" is="action-link" class="list-button" | 54 <a id="setupPinLink" is="action-link" class="list-button" |
| 50 on-tap="onConfigurePin_"> | 55 on-tap="onConfigurePin_"> |
|
stevenjb
2017/04/14 21:47:20
Why is this a link instead of a button like the re
sammiequon
2017/04/14 22:11:43
Yeah, it is a button in the newest mocks, but for
stevenjb
2017/04/14 22:29:02
Well, you're adding new CSS, which I'd really rath
sammiequon
2017/04/14 23:48:13
Removed. Switching to button in another CL which i
| |
| 51 [[getSetupPinText_(hasPin)]] | 56 [[getSetupPinText_(hasPin)]] |
| 52 </a> | 57 </a> |
| 53 </div> | 58 </div> |
| 54 </div> | 59 </div> |
| 55 | 60 |
| 56 <div id="screenLockDiv" class="settings-box"> | 61 <div id="screenLockDiv" class="settings-box"> |
| 57 <settings-toggle-button class="start" | 62 <settings-toggle-button class="start" |
| 58 pref="{{prefs.settings.enable_screen_lock}}" | 63 pref="{{prefs.settings.enable_screen_lock}}" |
| 59 label="$i18n{enableScreenlock}"> | 64 label="$i18n{enableScreenlock}"> |
| 60 </settings-toggle-button> | 65 </settings-toggle-button> |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 134 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 139 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> |
| 135 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 140 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
| 136 on-close="onEasyUnlockTurnOffDialogClose_"> | 141 on-close="onEasyUnlockTurnOffDialogClose_"> |
| 137 </easy-unlock-turn-off-dialog> | 142 </easy-unlock-turn-off-dialog> |
| 138 </template> | 143 </template> |
| 139 </div> | 144 </div> |
| 140 </template> | 145 </template> |
| 141 | 146 |
| 142 <script src="lock_screen.js"></script> | 147 <script src="lock_screen.js"></script> |
| 143 </dom-module> | 148 </dom-module> |
| OLD | NEW |