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

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

Issue 2848483002: md settings: Move setup pin error message. (Closed)
Patch Set: Css ordering. Created 3 years, 7 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/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"> 13 <style include="settings-shared">
14 .warning {
15 color: var(--paper-grey-700);
16 }
17
18 .warning > iron-icon {
19 --iron-icon-fill-color: var(--paper-grey-700);
20 }
21
22 .error { 14 .error {
23 color: var(--paper-red-500); 15 color: var(--paper-red-500);
24 } 16 }
25 17
26 .error > iron-icon { 18 .error > iron-icon {
27 --iron-icon-fill-color: var(--paper-red-500); 19 --iron-icon-fill-color: var(--paper-red-500);
28 } 20 }
29 21
22 .warning {
23 color: var(--paper-grey-700);
24 }
25
26 .warning > iron-icon {
27 --iron-icon-fill-color: var(--paper-grey-700);
28 }
29
30 #pinKeyboardDiv { 30 #pinKeyboardDiv {
31 justify-content: center; 31 justify-content: center;
32 } 32 }
33
34 #problemMessage {
35 font-size: 10px;
36 }
33 </style> 37 </style>
34 38
35 <dialog is="cr-dialog" id="dialog" on-close="close" 39 <dialog is="cr-dialog" id="dialog" on-close="close"
36 close-text="$i18n{close}"> 40 close-text="$i18n{close}">
37 <div class="title">[[getTitleMessage_(isConfirmStep_)]]</div> 41 <div class="title">[[getTitleMessage_(isConfirmStep_)]]</div>
38 <div class="body"> 42 <div class="body">
39 <!-- Warning/error; only shown if title is hidden. Id is needed for
40 tests. -->
41 <div id="problemDiv" class$="[[problemClass_]] settings-box first"
42 hidden$="[[!hasProblem_(problemMessage_)]]">
43 <iron-icon icon="settings:warning"></iron-icon>
44 <span class="middle">[[problemMessage_]]</span>
45 </div>
46
47 <!-- Pin keyboard --> 43 <!-- Pin keyboard -->
48 <div id="pinKeyboardDiv" class="settings-box continuation"> 44 <div id="pinKeyboardDiv" class="settings-box continuation">
49 <pin-keyboard id="pinKeyboard" on-pin-change="onPinChange_" 45 <pin-keyboard id="pinKeyboard" on-pin-change="onPinChange_"
50 on-submit="onPinSubmit_" value="{{pinKeyboardValue_}}"> 46 on-submit="onPinSubmit_" value="{{pinKeyboardValue_}}"
47 has-error$="[[hasError_(problemMessage_, problemClass_)]]">
48 <!-- Warning/error; only shown if title is hidden. Id is needed for
49 tests. -->
stevenjb 2017/05/15 18:51:12 nit: 'Id is needed for tests' is common enough tha
sammiequon 2017/05/15 19:45:15 Done.
50 <div id="problemDiv" class$="[[problemClass_]]"
51 hidden$="[[!problemMessage_]]" problem>
52 <iron-icon icon="settings:error-outline"></iron-icon>
53 <span id="problemMessage">[[problemMessage_]]</span>
54 </div>
51 </pin-keyboard> 55 </pin-keyboard>
52 </div> 56 </div>
53 57
54 <div class="button-strip"> 58 <div class="button-strip">
55 <paper-button class="cancel-button" on-tap="onCancelTap_"> 59 <paper-button class="cancel-button" on-tap="onCancelTap_">
56 $i18n{cancel} 60 $i18n{cancel}
57 </paper-button> 61 </paper-button>
58 62
59 <paper-button class="action-button" on-tap="onPinSubmit_" 63 <paper-button class="action-button" on-tap="onPinSubmit_"
60 disabled$="[[!enableSubmit_]]"> 64 disabled$="[[!enableSubmit_]]">
61 <span>[[getContinueMessage_(isConfirmStep_)]]</span> 65 <span>[[getContinueMessage_(isConfirmStep_)]]</span>
62 </paper-button> 66 </paper-button>
63 </div> 67 </div>
64 </div> 68 </div>
65 </dialog> 69 </dialog>
66 </template> 70 </template>
67 71
68 <script src="setup_pin_dialog.js"></script> 72 <script src="setup_pin_dialog.js"></script>
69 </dom-module> 73 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/icons.html ('k') | chrome/browser/resources/settings/people_page/setup_pin_dialog.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698