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

Side by Side Diff: chrome/browser/resources/settings/people_page/lock_screen.html

Issue 2823713002: md settings: Change action link to button on lock screen. (Closed)
Patch Set: 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/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/html/action_link.html">
3 <link rel="import" href="chrome://resources/html/action_link_css.html">
4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
5 <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">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 4 <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"> 5 <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"> 6 <link rel="import" href="../controls/settings_toggle_button.html">
9 <link rel="import" href="easy_unlock_browser_proxy.html"> 7 <link rel="import" href="easy_unlock_browser_proxy.html">
10 <link rel="import" href="easy_unlock_turn_off_dialog.html"> 8 <link rel="import" href="easy_unlock_turn_off_dialog.html">
11 <link rel="import" href="fingerprint_browser_proxy.html"> 9 <link rel="import" href="fingerprint_browser_proxy.html">
12 <link rel="import" href="lock_screen_constants.html"> 10 <link rel="import" href="lock_screen_constants.html">
13 <link rel="import" href="lock_state_behavior.html"> 11 <link rel="import" href="lock_state_behavior.html">
14 <link rel="import" href="password_prompt_dialog.html"> 12 <link rel="import" href="password_prompt_dialog.html">
15 <link rel="import" href="setup_pin_dialog.html"> 13 <link rel="import" href="setup_pin_dialog.html">
16 <link rel="import" href="../i18n_setup.html"> 14 <link rel="import" href="../i18n_setup.html">
17 <link rel="import" href="../prefs/prefs_behavior.html"> 15 <link rel="import" href="../prefs/prefs_behavior.html">
18 <link rel="import" href="../prefs/prefs.html"> 16 <link rel="import" href="../prefs/prefs.html">
19 <link rel="import" href="../route.html"> 17 <link rel="import" href="../route.html">
20 <link rel="import" href="../settings_shared_css.html"> 18 <link rel="import" href="../settings_shared_css.html">
21 19
22 <dom-module id="settings-lock-screen"> 20 <dom-module id="settings-lock-screen">
23 <template> 21 <template>
24 <style include="settings-shared action-link"> 22 <style include="settings-shared action-link">
25 #easyUnlock .start { 23 #easyUnlock .start {
26 /* When the easy unlock toggle is shown, the easy unlock section's 24 /* 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 25 * content becomes squashed to the top and bottom edges. Use padding to
28 * ensure the easy unlock content looks correct. */ 26 * ensure the easy unlock content looks correct. */
29 padding: 11px 0; 27 padding: 11px 0;
30 } 28 }
31 29
32 .radio-indent { 30 paper-radio-button > .start {
33 -webkit-margin-start: 36px; 31 flex: 1;
34 } 32 }
35 </style> 33 </style>
36 34
37 <div> 35 <div>
38 <div class="list-frame"> 36 <div class="list-frame">
39 <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> 37 <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}">
40 <paper-radio-button name="password"> 38 <paper-radio-button name="password">
41 $i18n{lockScreenPasswordOnly} 39 <div class="start">
40 $i18n{lockScreenPasswordOnly}
41 <div class="secondary">
42 $i18n{lockScreenHighSecurity}
43 </div>
44 </div>
42 </paper-radio-button> 45 </paper-radio-button>
43 <paper-radio-button name="pin+password"> 46 <paper-radio-button name="pin+password">
44 $i18n{lockScreenPinOrPassword} 47 <div class="start">
Dan Beam 2017/04/17 21:58:36 can you just do <style> #pin-or-password-wrapper
sammiequon 2017/04/18 00:04:24 I tried this this morning, but it doesn't seem to
stevenjb 2017/04/19 20:28:42 I poked around with this and the problem is that i
48 $i18n{lockScreenPinOrPassword}
49 <div class="secondary">
50 $i18n{lockScreenMediumSecurity}
51 </div>
52 </div>
53 <paper-button id="setupPinButton" class="secondary-button"
54 on-tap="onConfigurePin_"
55 disabled$="[[!showConfigurePinButton_(selectedUnlockType)]]">
56 [[getSetupPinText_(hasPin)]]
57 </paper-button>
45 </paper-radio-button> 58 </paper-radio-button>
46 </paper-radio-group> 59 </paper-radio-group>
47 <div class="list-item radio-indent"
48 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">
49 <a id="setupPinLink" is="action-link" class="list-button"
50 on-tap="onConfigurePin_">
51 [[getSetupPinText_(hasPin)]]
52 </a>
53 </div>
54 </div> 60 </div>
55 61
56 <div id="screenLockDiv" class="settings-box"> 62 <div id="screenLockDiv" class="settings-box">
57 <settings-toggle-button class="start" 63 <settings-toggle-button class="start"
58 pref="{{prefs.settings.enable_screen_lock}}" 64 pref="{{prefs.settings.enable_screen_lock}}"
59 label="$i18n{enableScreenlock}"> 65 label="$i18n{enableScreenlock}">
60 </settings-toggle-button> 66 </settings-toggle-button>
61 </div> 67 </div>
62 68
63 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> 69 <template is="dom-if" if="[[fingerprintUnlockEnabled_]]">
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> 140 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]">
135 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" 141 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"
136 on-close="onEasyUnlockTurnOffDialogClose_"> 142 on-close="onEasyUnlockTurnOffDialogClose_">
137 </easy-unlock-turn-off-dialog> 143 </easy-unlock-turn-off-dialog>
138 </template> 144 </template>
139 </div> 145 </div>
140 </template> 146 </template>
141 147
142 <script src="lock_screen.js"></script> 148 <script src="lock_screen.js"></script>
143 </dom-module> 149 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698