| Index: chrome/browser/resources/settings/people_page/users_page.html
|
| diff --git a/chrome/browser/resources/settings/people_page/users_page.html b/chrome/browser/resources/settings/people_page/users_page.html
|
| index 228bbc0e0136c5d3f5a7ad2d6bc9aadf7bcbe5fa..ba9e09c8e7084792dfe30ae4f03589c06146fbde 100644
|
| --- a/chrome/browser/resources/settings/people_page/users_page.html
|
| +++ b/chrome/browser/resources/settings/people_page/users_page.html
|
| @@ -13,14 +13,24 @@
|
| /* The users box must line up with the checkbox text. */
|
| -webkit-margin-start: 36px;
|
| }
|
| +
|
| + .settings-box:first-of-type {
|
| + border-top: none;
|
| + }
|
| +
|
| + #add-user-button {
|
| + /* Add user button must be lined up with the start of users' names. */
|
| + -webkit-margin-start: 56px;
|
| + }
|
| </style>
|
| - <div class="settings-box"
|
| - hidden$="[[isOwnerLabelHidden_(isOwner_, isWhitelistManaged_)]]">
|
| - $i18n{usersModifiedByOwnerLabel}
|
| - </div>
|
| - <div class="settings-box" hidden$="[[!isWhitelistManaged_]]">
|
| - $i18n{settingsManagedLabel}
|
| - </div>
|
| + <template is="dom-if" if="[[isWhitelistManaged_]]">
|
| + <div class="settings-box">$i18n{settingsManagedLabel}</div>
|
| + </template>
|
| + <template is="dom-if" if="[[!isWhitelistManaged_]]">
|
| + <template is="dom-if" if="[[!isOwner_]]">
|
| + <div class="settings-box">$i18n{usersModifiedByOwnerLabel}</div>
|
| + </template>
|
| + </template>
|
| <div class="settings-box block">
|
| <settings-checkbox
|
| pref="{{prefs.cros.accounts.allowBWSI}}"
|
| @@ -46,12 +56,15 @@
|
| </settings-checkbox>
|
| <div class="users">
|
| <settings-user-list prefs="[[prefs]]"
|
| - disabled="[[isEditingUsersDisabled_(isOwner_, isWhitelistManaged_, prefs.cros.accounts.allowGuest.value)]]">
|
| + disabled="[[isEditingUsersDisabled_(isOwner_, isWhitelistManaged_,
|
| + prefs.cros.accounts.allowGuest.value)]]">
|
| </settings-user-list>
|
| - <paper-button on-tap="openAddUserDialog_"
|
| - disabled="[[isEditingUsersDisabled_(isOwner_, isWhitelistManaged_, prefs.cros.accounts.allowGuest.value)]]">
|
| + <div id="add-user-button" class="list-item list-button"
|
| + on-tap="openAddUserDialog_"
|
| + hidden="[[isEditingUsersDisabled_(isOwner_, isWhitelistManaged_,
|
| + prefs.cros.accounts.allowGuest.value)]]">
|
| $i18n{addUsers}
|
| - </paper-button>
|
| + </div>
|
| </div>
|
| </div>
|
| <settings-users-add-user-dialog id="addUserDialog">
|
|
|