Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="/import_supervised_user.html"> | 1 <link rel="import" href="/import_supervised_user.html"> |
| 2 <link rel="import" href="/profile_browser_proxy.html"> | 2 <link rel="import" href="/profile_browser_proxy.html"> |
| 3 <link rel="import" href="/shared_styles.html"> | 3 <link rel="import" href="/shared_styles.html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/cr_profile_avatar_select or/cr_profile_avatar_selector.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/cr_profile_avatar_select or/cr_profile_avatar_selector.html"> |
| 5 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 6 <link rel="import" href="chrome://resources/html/action_link.html"> | 6 <link rel="import" href="chrome://resources/html/action_link.html"> |
| 7 <link rel="import" href="chrome://resources/html/cr.html"> | 7 <link rel="import" href="chrome://resources/html/cr.html"> |
| 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 9 <link rel="import" href="chrome://resources/html/polymer.html"> | 9 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 10 <link rel="import" href="chrome://resources/html/md_select_css.html"> | |
| 10 <link rel="import" href="chrome://resources/html/util.html"> | 11 <link rel="import" href="chrome://resources/html/util.html"> |
| 11 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 12 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 12 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> | 13 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> |
| 13 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 14 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 14 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> | 15 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> |
| 15 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu.html"> | |
| 16 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> | 16 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> |
| 17 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml"> | |
| 18 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis tbox.html"> | |
| 19 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | 17 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
| 20 | 18 |
| 21 <dom-module id="create-profile"> | 19 <dom-module id="create-profile"> |
| 22 <template> | 20 <template> |
| 23 <style include="shared-styles iron-positioning"> | 21 <style include="shared-styles iron-positioning md-select"> |
| 24 .container { | 22 .container { |
| 25 color: var(--primary-text-color); | 23 color: var(--primary-text-color); |
| 26 width: var(--page-width); | 24 width: var(--page-width); |
| 27 } | 25 } |
| 28 | 26 |
| 29 #message-container { | 27 #message-container { |
| 30 -webkit-transition: top 400ms cubic-bezier(.4, 0, .2, 1), | 28 -webkit-transition: top 400ms cubic-bezier(.4, 0, .2, 1), |
| 31 visibility 0s linear 400ms; | 29 visibility 0s linear 400ms; |
| 32 align-items: center; | 30 align-items: center; |
| 33 background-color: var(--paper-red-50); | 31 background-color: var(--paper-red-50); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 65 text-decoration: underline; | 63 text-decoration: underline; |
| 66 } | 64 } |
| 67 | 65 |
| 68 #title-bar { | 66 #title-bar { |
| 69 border-bottom: var(--user-manager-separator-line); | 67 border-bottom: var(--user-manager-separator-line); |
| 70 font-size: 16px; | 68 font-size: 16px; |
| 71 font-weight: 500; | 69 font-weight: 500; |
| 72 padding: 104px 0 16px; | 70 padding: 104px 0 16px; |
| 73 } | 71 } |
| 74 | 72 |
| 75 #nameInput, | 73 #nameInput { |
| 76 paper-dropdown-menu { | |
| 77 --paper-input-container-focus-color: var(--google-blue-500); | 74 --paper-input-container-focus-color: var(--google-blue-500); |
| 78 --paper-input-container-input: { | 75 --paper-input-container-input: { |
| 79 font-size: inherit; | 76 font-size: inherit; |
| 80 }; | 77 }; |
| 81 --paper-input-container-label: { | 78 --paper-input-container-label: { |
| 82 font-size: inherit; | 79 font-size: inherit; |
| 83 }; | 80 }; |
| 84 } | 81 } |
| 85 | 82 |
| 86 #nameInput { | 83 #nameInput { |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 102 } | 99 } |
| 103 | 100 |
| 104 #supervised-user-container { | 101 #supervised-user-container { |
| 105 -webkit-padding-start: 32px; | 102 -webkit-padding-start: 32px; |
| 106 } | 103 } |
| 107 | 104 |
| 108 #supervised-user-container #learn-more { | 105 #supervised-user-container #learn-more { |
| 109 line-height: 20px; | 106 line-height: 20px; |
| 110 } | 107 } |
| 111 | 108 |
| 112 #supervised-user-container paper-dropdown-menu { | 109 #supervised-user-container .md-select-wrapper { |
| 110 -webkit-margin-start: calc(-1 * var(--md-select-side-padding)); | |
|
dpapad
2017/06/16 00:55:19
I've found two other places where we do similar th
scottchen
2017/06/16 01:53:20
Yes!
| |
| 113 margin-top: 4px; | 111 margin-top: 4px; |
| 114 width: 200px; | |
| 115 } | |
| 116 | |
| 117 #supervised-user-container paper-listbox paper-item { | |
| 118 --paper-item: { | |
| 119 font-size: inherit; | |
| 120 min-height: 40px; | |
| 121 }; | |
| 122 } | 112 } |
| 123 | 113 |
| 124 #supervised-user-container #import-user { | 114 #supervised-user-container #import-user { |
| 125 -webkit-margin-start: 16px; | 115 -webkit-margin-start: 16px; |
| 126 } | 116 } |
| 127 | 117 |
| 128 #supervised-user-container #sign-in-howto-message { | 118 #supervised-user-container #sign-in-howto-message { |
| 129 margin-top: 12px; | 119 margin-top: 12px; |
| 130 } | 120 } |
| 131 | 121 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 167 <template is="dom-if" if="[[!isForceSigninEnabled_]]"> | 157 <template is="dom-if" if="[[!isForceSigninEnabled_]]"> |
| 168 <paper-checkbox id="makeSupervisedCheckbox" checked="{{isSupervised_}}"> | 158 <paper-checkbox id="makeSupervisedCheckbox" checked="{{isSupervised_}}"> |
| 169 $i18n{manageProfilesSupervisedSignedInLabel} | 159 $i18n{manageProfilesSupervisedSignedInLabel} |
| 170 </paper-checkbox> | 160 </paper-checkbox> |
| 171 <div id="supervised-user-container"> | 161 <div id="supervised-user-container"> |
| 172 <div id="learn-more" > | 162 <div id="learn-more" > |
| 173 <a is="action-link" on-tap="onLearnMoreTap_">$i18n{learnMore}</a> | 163 <a is="action-link" on-tap="onLearnMoreTap_">$i18n{learnMore}</a> |
| 174 </div> | 164 </div> |
| 175 <template is="dom-if" if="[[isSupervised_]]"> | 165 <template is="dom-if" if="[[isSupervised_]]"> |
| 176 <template is="dom-if" if="[[isSignedIn_(signedInUsers_)]]"> | 166 <template is="dom-if" if="[[isSignedIn_(signedInUsers_)]]"> |
| 177 <paper-dropdown-menu label="$i18n{selectAnAccount}" no-label-float > | 167 <div class="md-select-wrapper"> |
| 178 <paper-listbox class="dropdown-content" | 168 <select class="md-select" on-change="onAccountChanged_"> |
| 179 selected="{{signedInUserIndex_}}" | 169 <option disabled selected>$i18n{selectAnAccount}</option> |
| 180 attr-for-selected="data-user-index"> | |
| 181 <template is="dom-repeat" items="[[signedInUsers_]]"> | 170 <template is="dom-repeat" items="[[signedInUsers_]]"> |
| 182 <paper-item data-user-index$="[[index]]"> | 171 <option value="[[index]]"> |
| 183 [[item.username]] | 172 [[item.username]] |
| 184 </paper-item> | 173 </option> |
| 185 </template> | 174 </template> |
| 186 </paper-listbox> | 175 </select> |
| 187 </paper-dropdown-menu> | 176 <span class="md-select-underline"></span> |
| 177 </div> | |
| 188 <a id="import-user" is="action-link" on-tap="onImportUserTap_" | 178 <a id="import-user" is="action-link" on-tap="onImportUserTap_" |
| 189 hidden="[[isImportUserLinkHidden_(createInProgress_, | 179 hidden="[[isImportUserLinkHidden_(createInProgress_, |
| 190 loadingSupervisedUsers_, | 180 loadingSupervisedUsers_, |
| 191 signedInUserIndex_)]]"> | 181 signedInUserIndex_)]]"> |
| 192 $i18n{importExistingSupervisedUserLink} | 182 $i18n{importExistingSupervisedUserLink} |
| 193 </a> | 183 </a> |
| 194 </template> | 184 </template> |
| 195 <div id="sign-in-howto-message" | 185 <div id="sign-in-howto-message" |
| 196 hidden="[[isSignedIn_(signedInUsers_)]]" | 186 hidden="[[isSignedIn_(signedInUsers_)]]" |
| 197 inner-h-t-m-l="[[i18nAllowIDAttr_('noSignedInUserMessage')]]"> | 187 inner-h-t-m-l="[[i18nAllowIDAttr_('noSignedInUserMessage')]]"> |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 212 loadingSupervisedUsers_, | 202 loadingSupervisedUsers_, |
| 213 profileName_)]]"> | 203 profileName_)]]"> |
| 214 $i18n{createProfileConfirm} | 204 $i18n{createProfileConfirm} |
| 215 </paper-button> | 205 </paper-button> |
| 216 </div> | 206 </div> |
| 217 <import-supervised-user id="importUserPopup"></import-supervised-user> | 207 <import-supervised-user id="importUserPopup"></import-supervised-user> |
| 218 </div> | 208 </div> |
| 219 </template> | 209 </template> |
| 220 <script src="create_profile.js"></script> | 210 <script src="create_profile.js"></script> |
| 221 </dom-module> | 211 </dom-module> |
| OLD | NEW |