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

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

Issue 2815783002: [MD settings] vertical align left edge of icons and text in ChromeOS People (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
« no previous file with comments | « chrome/browser/resources/settings/people_page/user_list.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/html/action_link.html"> 1 <link rel="import" href="chrome://resources/html/action_link.html">
2 <link rel="import" href="chrome://resources/html/action_link_css.html"> 2 <link rel="import" href="chrome://resources/html/action_link_css.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
6 <link rel="import" href="../controls/settings_toggle_button.html"> 6 <link rel="import" href="../controls/settings_toggle_button.html">
7 <link rel="import" href="../settings_shared_css.html"> 7 <link rel="import" href="../settings_shared_css.html">
8 <link rel="import" href="user_list.html"> 8 <link rel="import" href="user_list.html">
9 <link rel="import" href="users_add_user_dialog.html"> 9 <link rel="import" href="users_add_user_dialog.html">
10 10
11 <dom-module id="settings-users-page"> 11 <dom-module id="settings-users-page">
12 <template> 12 <template>
13 <style include="settings-shared action-link"> 13 <style include="settings-shared action-link">
14 .users {
15 /* The users box must line up with the checkbox text. */
16 -webkit-margin-start: var(--settings-indent-width);
17 }
18
19 .settings-box:first-of-type { 14 .settings-box:first-of-type {
20 border-top: none; 15 border-top: none;
21 } 16 }
22 17
23 #add-user-button { 18 #add-user-button {
24 /* Add user button must be lined up with the start of users' names. */ 19 /* Add user button must be lined up with the start of users' names. */
25 /* TODO(dschuyler): Should this be var(--settings-box-row-indent) rather 20 -webkit-margin-start: var(--settings-box-row-indent);
26 than 56px? */
27 -webkit-margin-start: 56px;
28 } 21 }
29 </style> 22 </style>
30 <template is="dom-if" if="[[isWhitelistManaged_]]"> 23 <template is="dom-if" if="[[isWhitelistManaged_]]">
31 <div class="settings-box">$i18n{settingsManagedLabel}</div> 24 <div class="settings-box">$i18n{settingsManagedLabel}</div>
32 </template> 25 </template>
33 <template is="dom-if" if="[[!isWhitelistManaged_]]"> 26 <template is="dom-if" if="[[!isWhitelistManaged_]]">
34 <template is="dom-if" if="[[!isOwner_]]"> 27 <template is="dom-if" if="[[!isOwner_]]">
35 <div class="settings-box">$i18n{usersModifiedByOwnerLabel}</div> 28 <div class="settings-box">$i18n{usersModifiedByOwnerLabel}</div>
36 </template> 29 </template>
37 </template> 30 </template>
(...skipping 13 matching lines...) Expand all
51 label="$i18n{showOnSigninLabel}" 44 label="$i18n{showOnSigninLabel}"
52 disabled="[[isEditingDisabled_(isOwner_, isWhitelistManaged_)]]"> 45 disabled="[[isEditingDisabled_(isOwner_, isWhitelistManaged_)]]">
53 </settings-toggle-button> 46 </settings-toggle-button>
54 <settings-toggle-button 47 <settings-toggle-button
55 pref="{{prefs.cros.accounts.allowGuest}}" 48 pref="{{prefs.cros.accounts.allowGuest}}"
56 id="restrictSignIn" 49 id="restrictSignIn"
57 label="$i18n{restrictSigninLabel}" 50 label="$i18n{restrictSigninLabel}"
58 disabled="[[isEditingDisabled_(isOwner_, isWhitelistManaged_)]]" 51 disabled="[[isEditingDisabled_(isOwner_, isWhitelistManaged_)]]"
59 inverted> 52 inverted>
60 </settings-toggle-button> 53 </settings-toggle-button>
61 <div class="users"> 54 </div>
62 <settings-user-list prefs="[[prefs]]" 55 <div class="list-frame">
63 disabled="[[isEditingUsersDisabled_(isOwner_, isWhitelistManaged_, 56 <settings-user-list prefs="[[prefs]]"
64 prefs.cros.accounts.allowGuest.value)]]"> 57 disabled="[[isEditingUsersDisabled_(isOwner_, isWhitelistManaged_,
65 </settings-user-list> 58 prefs.cros.accounts.allowGuest.value)]]">
66 <div id="add-user-button" class="list-item" 59 </settings-user-list>
67 hidden="[[isEditingUsersDisabled_(isOwner_, isWhitelistManaged_, 60 <div id="add-user-button" class="list-item"
68 prefs.cros.accounts.allowGuest.value)]]"> 61 hidden="[[isEditingUsersDisabled_(isOwner_, isWhitelistManaged_,
69 <a is="action-link" class="list-button" on-tap="openAddUserDialog_"> 62 prefs.cros.accounts.allowGuest.value)]]">
70 $i18n{addUsers} 63 <a is="action-link" class="list-button" on-tap="openAddUserDialog_">
71 </a> 64 $i18n{addUsers}
72 </div> 65 </a>
73 </div> 66 </div>
74 </div> 67 </div>
75 <settings-users-add-user-dialog id="addUserDialog" 68 <settings-users-add-user-dialog id="addUserDialog"
76 on-close="onAddUserDialogClose_"> 69 on-close="onAddUserDialogClose_">
77 </settings-users-add-user-dialog> 70 </settings-users-add-user-dialog>
78 </template> 71 </template>
79 <script src="users_page.js"></script> 72 <script src="users_page.js"></script>
80 </dom-module> 73 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/people_page/user_list.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698