Index: chrome/browser/resources/md_user_manager/create_profile.html |
diff --git a/chrome/browser/resources/md_user_manager/create_profile.html b/chrome/browser/resources/md_user_manager/create_profile.html |
index 19c76b97312d74503a51fdce3a31bf7beddeec11..a31eaa39dfb8be2b1d70337aad0f2642bd3ff00d 100644 |
--- a/chrome/browser/resources/md_user_manager/create_profile.html |
+++ b/chrome/browser/resources/md_user_manager/create_profile.html |
@@ -17,11 +17,10 @@ |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner.html"> |
<dom-module id="create-profile"> |
- <link rel="import" type="css" href="chrome://resources/css/action_link.css"> |
<template> |
<style include="shared-styles"> |
.container { |
- color: var(--paper-grey-800); |
+ color: var(--main-text-color); |
margin: 0 auto; |
width: 624px; |
} |
@@ -60,9 +59,6 @@ |
#nameInput, |
paper-dropdown-menu { |
- --paper-input-container: { |
- padding: 0; |
- }; |
--paper-input-container-input: { |
color: inherit; |
font-size: inherit; |
@@ -75,26 +71,6 @@ |
width: 300px; |
} |
- paper-dropdown-menu { |
- margin-top: 12px; |
- width: 200px; |
- } |
- |
- paper-menu { |
- --paper-menu: { |
- color: inherit; |
- padding: 0; |
- }; |
- --paper-menu-selected-item: { |
- font-weight: normal; |
- } |
- } |
- |
- paper-menu paper-item { |
- font-size: inherit; |
- min-height: 40px; |
- } |
- |
#icons #wrapper { |
display: flex; |
flex-wrap: wrap; |
@@ -107,38 +83,61 @@ |
margin: 12px; |
min-width: 0; |
padding: 6px 4px; |
+ --paper-button-flat-keyboard-focus: { |
+ outline: auto; |
+ }; |
} |
#icons paper-button[active] { |
border-color: var(--google-blue-500); |
} |
- #icons paper-button:focus:not([active]) { |
- outline: 1px dotted #666; |
- } |
- |
#supervised-user-container { |
margin-top: 24px; |
} |
#supervised-user-container paper-checkbox { |
+ --primary-text-color: var(--main-text-color); |
--paper-checkbox-label-spacing: 16px; |
--paper-checkbox-size: 20px; |
} |
- #supervised-user-container #learn-more-accounts { |
+ #supervised-user-container #learn-more-custodians { |
-webkit-margin-start: 36px; |
} |
#supervised-user-container #learn-more { |
- display: block; |
line-height: 20px; |
} |
- #supervised-user-container #import-user { |
+ #supervised-user-container paper-dropdown-menu { |
+ margin-top: 4px; |
+ width: 200px; |
+ } |
+ |
+ #supervised-user-container paper-menu { |
+ --paper-menu: { |
+ color: inherit; |
+ padding: 0; |
+ }; |
+ --paper-menu-selected-item: { |
+ font-weight: normal; |
+ }; |
+ } |
+ |
+ #supervised-user-container paper-menu paper-item { |
+ font-size: inherit; |
+ min-height: 40px; |
+ } |
+ |
+ #supervised-user-container #import-user-link { |
-webkit-margin-start: 16px; |
} |
+ #supervised-user-container #sign-in-howto-message { |
+ margin-top: 12px; |
+ } |
+ |
#actions { |
bottom: 16px; |
display: flex; |
@@ -151,41 +150,18 @@ |
right: auto; |
} |
- #actions paper-button { |
- border-radius: 2px; |
- font-weight: 500; |
- line-height: 32px; |
- margin: 0; |
- min-width: 52px; |
- padding: 0 16px; |
- } |
- |
#actions paper-spinner { |
align-self: center; |
height: 20px; |
width: 20px; |
} |
- |
- #actions #cancel { |
- color: var(--paper-grey-600); |
- } |
- |
- #actions #save { |
- -webkit-margin-start: 8px; |
- background: var(--google-blue-500); |
- color: white; |
- } |
- |
- #actions #save[disabled] { |
- background: rgba(66, 133, 244, .5); |
- } |
</style> |
<div id="message-container" hidden="[[!message_]]"> |
<iron-icon icon="warning"></iron-icon> |
<span id="message" inner-h-t-m-l="[[message_]]"></span> |
</div> |
<div class="container"> |
- <div id="title-bar" i18n-content="createProfileTitle"></div> |
+ <div id="title-bar">$i18n{createProfileTitle}</div> |
<paper-input id="nameInput" value="{{profileName_}}" pattern=".*\S.*" |
no-label-float auto-validate> |
</paper-input> |
@@ -199,46 +175,55 @@ |
</template> |
</div> |
</div> |
- <template is="dom-if" if="[[isSignedIn_(signedInUsers_)]]"> |
- <div id="supervised-user-container"> |
- <paper-checkbox checked="{{isSupervised_}}"> |
- [[i18n('manageProfilesSupervisedSignedInLabel')]] |
- </paper-checkbox> |
- <div id="learn-more-accounts"> |
- <a id="learn-more" is="action-link" on-tap="onLearnMoreTap_"> |
- [[i18n('learnMore')]] |
- </a> |
+ <div id="supervised-user-container"> |
+ <paper-checkbox checked="{{isSupervised_}}"> |
+ $i18n{manageProfilesSupervisedSignedInLabel} |
+ </paper-checkbox> |
+ <div id="learn-more-custodians"> |
+ <a id="learn-more" is="action-link" on-tap="onLearnMoreTap_"> |
+ $i18n{learnMore} |
+ </a> |
+ <div id="custodians"> |
<template is="dom-if" if="[[isSupervised_]]"> |
- <paper-dropdown-menu no-label-float> |
- <paper-menu class="dropdown-content" |
- selected="{{signedInUserIndex_}}" |
- attr-for-selected="data-user-index"> |
- <paper-item data-user-index$="[[NO_USER_SELECTED]]"> |
- [[i18n('selectAnAccount')]] |
- </paper-item> |
- <template is="dom-repeat" items="[[signedInUsers_]]"> |
- <paper-item data-user-index$="[[index]]"> |
- [[item.username]] |
+ <template is="dom-if" if="[[isSignedIn_(signedInUsers_)]]"> |
+ <paper-dropdown-menu no-label-float> |
+ <paper-menu class="dropdown-content" |
+ selected="{{signedInUserIndex_}}" |
+ attr-for-selected="data-user-index"> |
+ <paper-item data-user-index$="[[NO_USER_SELECTED]]"> |
+ $i18n{selectAnAccount} |
</paper-item> |
- </template> |
- </paper-menu> |
- </paper-dropdown-menu> |
- <a id="import-user" is="action-link" on-tap="onImportUserTap_" |
- hidden="[[isImportUserLinkHidden_(createInProgress_, |
- signedInUserIndex_)]]"> |
- [[i18n('importExistingSupervisedUserLink')]] |
- </a> |
+ <template is="dom-repeat" items="[[signedInUsers_]]"> |
+ <paper-item data-user-index$="[[index]]"> |
+ [[item.username]] |
+ </paper-item> |
+ </template> |
+ </paper-menu> |
+ </paper-dropdown-menu> |
+ <a id="import-user-link" is="action-link" |
+ on-tap="onImportUserLinkTap_" |
+ hidden="[[isImportUserLinkHidden_(createInProgress_, |
+ signedInUserIndex_)]]"> |
+ $i18n{importExistingSupervisedUserLink} |
+ </a> |
+ </template> |
+ <div id="sign-in-howto-message" |
+ hidden="[[isSignedIn_(signedInUsers_)]]" |
+ inner-h-t-m-l="[[i18n('noSignedInUserMessage')]]"> |
+ </div> |
</template> |
</div> |
</div> |
- </template> |
+ </div> |
<div id="actions"> |
<paper-spinner active="[[createInProgress_]]"></paper-spinner> |
- <paper-button id="cancel" on-tap="onCancelTap_" i18n-content="cancel"> |
+ <paper-button id="cancel" class="action secondary" |
+ on-tap="onCancelTap_"> |
+ $i18n{cancel} |
</paper-button> |
- <paper-button id="save" on-tap="onSaveTap_" |
- i18n-content="createProfileConfirm" |
+ <paper-button id="save" class="action primary" on-tap="onSaveTap_" |
disabled="[[isSaveDisabled_(createInProgress_, profileName_)]]"> |
+ $i18n{createProfileConfirm} |
</paper-button> |
</div> |
<import-supervised-user id="importUserPopup"></import-supervised-user> |