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

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

Issue 2639373002: MD Settings: clean up text controls (links, buttons) (Closed)
Patch Set: move comment about action_link_css to action_likn_css.html Created 3 years, 11 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">
2 <link rel="import" href="chrome://resources/html/action_link.html">
3 <link rel="import" href="chrome://resources/html/action_link_css.html">
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <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-radio-group/paper -radio-group.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html">
5 <link rel="import" href="/controls/settings_toggle_button.html"> 6 <link rel="import" href="/controls/settings_toggle_button.html">
6 <link rel="import" href="/people_page/lock_screen_constants.html"> 7 <link rel="import" href="/people_page/lock_screen_constants.html">
7 <link rel="import" href="/people_page/lock_state_behavior.html"> 8 <link rel="import" href="/people_page/lock_state_behavior.html">
8 <link rel="import" href="/people_page/password_prompt_dialog.html"> 9 <link rel="import" href="/people_page/password_prompt_dialog.html">
9 <link rel="import" href="/people_page/setup_pin_dialog.html"> 10 <link rel="import" href="/people_page/setup_pin_dialog.html">
10 <link rel="import" href="/prefs/prefs_behavior.html"> 11 <link rel="import" href="/prefs/prefs_behavior.html">
11 <link rel="import" href="/route.html"> 12 <link rel="import" href="/route.html">
12 <link rel="import" href="/settings_shared_css.html"> 13 <link rel="import" href="/settings_shared_css.html">
13 14
14 <dom-module id="settings-lock-screen"> 15 <dom-module id="settings-lock-screen">
15 <template> 16 <template>
16 <style include="settings-shared"></style> 17 <style include="settings-shared action-link"></style>
17 <style> 18 <style>
18 .radio-indent { 19 .radio-indent {
19 margin-left: 28px; 20 margin-left: 36px;
20 }
21
22 paper-button {
23 text-transform: none;
24 } 21 }
25 </style> 22 </style>
26 23
27 <div> 24 <div>
28 <div class="list-frame"> 25 <div class="list-frame">
29 <paper-radio-group selected="{{selectedUnlockType}}"> 26 <paper-radio-group selected="{{selectedUnlockType}}">
30 <paper-radio-button name="password"> 27 <paper-radio-button name="password">
31 $i18n{lockScreenPasswordOnly} 28 $i18n{lockScreenPasswordOnly}
32 </paper-radio-button> 29 </paper-radio-button>
33 <paper-radio-button name="pin+password"> 30 <paper-radio-button name="pin+password">
34 $i18n{lockScreenPinOrPassword} 31 $i18n{lockScreenPinOrPassword}
35 </paper-radio-button> 32 </paper-radio-button>
36 <div class="settings-box continuation radio-indent"
37 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">
38 <!-- TODO(dbeam): I seriously doubt paper-button[is=action-link] is
39 a good idea. -->
40 <paper-button is="action-link" on-tap="onConfigurePin_">
41 [[getSetupPinText_(hasPin)]]
42 </paper-button>
43 </div>
44 </paper-radio-group> 33 </paper-radio-group>
34 <div class="list-item radio-indent"
35 hidden$="[[!showConfigurePinButton_(selectedUnlockType)]]">
36 <a is="action-link" class="list-button" on-tap="onConfigurePin_">
37 [[getSetupPinText_(hasPin)]]
38 </a>
39 </div>
45 </div> 40 </div>
46 41
47 <div class="settings-box"> 42 <div class="settings-box">
48 <settings-toggle-button class="start" 43 <settings-toggle-button class="start"
49 pref="{{prefs.settings.enable_screen_lock}}" 44 pref="{{prefs.settings.enable_screen_lock}}"
50 label="$i18n{enableScreenlock}"> 45 label="$i18n{enableScreenlock}">
51 </settings-toggle-button> 46 </settings-toggle-button>
52 </div> 47 </div>
53 48
54 <settings-password-prompt-dialog id="passwordPrompt" 49 <settings-password-prompt-dialog id="passwordPrompt"
55 on-close="onPasswordClosed_" set-modes="{{setModes_}}"> 50 on-close="onPasswordClosed_" set-modes="{{setModes_}}">
56 </settings-password-prompt-dialog> 51 </settings-password-prompt-dialog>
57 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_" 52 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"
58 set-modes="[[setModes_]]"> 53 set-modes="[[setModes_]]">
59 </settings-setup-pin-dialog> 54 </settings-setup-pin-dialog>
60 </div> 55 </div>
61 </template> 56 </template>
62 57
63 <script src="lock_screen.js"></script> 58 <script src="lock_screen.js"></script>
64 </dom-module> 59 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698