OLD | NEW |
---|---|
1 <link rel="import" href="chrome://md-user-manager/import_supervised_user.html"> | 1 <link rel="import" href="chrome://md-user-manager/import_supervised_user.html"> |
2 <link rel="import" href="chrome://md-user-manager/profile_browser_proxy.html"> | 2 <link rel="import" href="chrome://md-user-manager/profile_browser_proxy.html"> |
3 <link rel="import" href="chrome://md-user-manager/shared_styles.html"> | 3 <link rel="import" href="chrome://md-user-manager/shared_styles.html"> |
4 <link rel="import" href="chrome://resources/html/action_link.html"> | 4 <link rel="import" href="chrome://resources/html/action_link.html"> |
5 <link rel="import" href="chrome://resources/html/cr.html"> | 5 <link rel="import" href="chrome://resources/html/cr.html"> |
6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
7 <link rel="import" href="chrome://resources/html/polymer.html"> | 7 <link rel="import" href="chrome://resources/html/polymer.html"> |
8 <link rel="import" href="chrome://resources/html/util.html"> | 8 <link rel="import" href="chrome://resources/html/util.html"> |
9 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 9 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
68 font-size: inherit; | 68 font-size: inherit; |
69 }; | 69 }; |
70 } | 70 } |
71 | 71 |
72 #nameInput { | 72 #nameInput { |
73 margin-bottom: 24px; | 73 margin-bottom: 24px; |
74 margin-top: 32px; | 74 margin-top: 32px; |
75 width: 300px; | 75 width: 300px; |
76 } | 76 } |
77 | 77 |
78 paper-dropdown-menu { | |
79 margin-top: 12px; | |
80 width: 200px; | |
81 } | |
82 | |
83 paper-menu { | |
84 --paper-menu: { | |
85 color: inherit; | |
86 padding: 0; | |
87 }; | |
88 --paper-menu-selected-item: { | |
89 font-weight: normal; | |
90 } | |
91 } | |
92 | |
93 paper-menu paper-item { | |
94 font-size: inherit; | |
95 min-height: 40px; | |
96 } | |
97 | |
98 #icons #wrapper { | 78 #icons #wrapper { |
99 display: flex; | 79 display: flex; |
100 flex-wrap: wrap; | 80 flex-wrap: wrap; |
101 margin: -12px; | 81 margin: -12px; |
102 } | 82 } |
103 | 83 |
104 #icons paper-button { | 84 #icons paper-button { |
105 background: var(--paper-grey-300); | 85 background: var(--paper-grey-300); |
106 border: 1px solid rgba(0, 0, 0, .12); | 86 border: 1px solid rgba(0, 0, 0, .12); |
107 margin: 12px; | 87 margin: 12px; |
108 min-width: 0; | 88 min-width: 0; |
109 padding: 6px 4px; | 89 padding: 6px 4px; |
110 } | 90 } |
111 | 91 |
112 #icons paper-button[active] { | 92 #icons paper-button[active] { |
113 border-color: var(--google-blue-500); | 93 border-color: var(--google-blue-500); |
114 } | 94 } |
115 | 95 |
116 #icons paper-button:focus:not([active]) { | 96 #icons paper-button:focus:not([active]) { |
117 outline: 1px dotted #666; | 97 outline: 1px dotted #666; |
118 } | 98 } |
119 | 99 |
120 #supervised-user-container { | 100 #supervised-user-container { |
121 margin-top: 24px; | 101 margin-top: 24px; |
122 } | 102 } |
123 | 103 |
124 #supervised-user-container paper-checkbox { | 104 #supervised-user-container paper-checkbox { |
105 --primary-text-color: var(--paper-grey-800); | |
125 --paper-checkbox-label-spacing: 16px; | 106 --paper-checkbox-label-spacing: 16px; |
126 --paper-checkbox-size: 20px; | 107 --paper-checkbox-size: 20px; |
127 } | 108 } |
128 | 109 |
129 #supervised-user-container #learn-more-accounts { | 110 #supervised-user-container #learn-more, |
tommycli
2016/05/02 19:10:12
instead of this, can you use
-webkit-padding-star
Moe
2016/05/02 20:34:56
Done.
| |
111 #supervised-user-container #custodians { | |
130 -webkit-margin-start: 36px; | 112 -webkit-margin-start: 36px; |
131 } | 113 } |
132 | 114 |
133 #supervised-user-container #learn-more { | 115 #supervised-user-container #learn-more { |
134 display: block; | |
135 line-height: 20px; | 116 line-height: 20px; |
136 } | 117 } |
137 | 118 |
119 #supervised-user-container paper-dropdown-menu { | |
tommycli
2016/05/02 19:10:13
What was the purpose of moving these rules to the
Moe
2016/05/02 20:34:56
It's more for readability and personal preference.
| |
120 margin-top: 4px; | |
121 width: 200px; | |
122 } | |
123 | |
124 #supervised-user-container paper-menu { | |
125 --paper-menu: { | |
126 color: inherit; | |
127 padding: 0; | |
128 }; | |
129 --paper-menu-selected-item: { | |
130 font-weight: normal; | |
131 }; | |
132 } | |
133 | |
134 #supervised-user-container paper-menu paper-item { | |
135 font-size: inherit; | |
136 min-height: 40px; | |
137 } | |
138 | |
138 #supervised-user-container #import-user { | 139 #supervised-user-container #import-user { |
139 -webkit-margin-start: 16px; | 140 -webkit-margin-start: 16px; |
140 } | 141 } |
141 | 142 |
143 #supervised-user-container #sign-in-howto-message { | |
144 margin-top: 12px; | |
145 } | |
146 | |
142 #actions { | 147 #actions { |
143 bottom: 16px; | 148 bottom: 16px; |
144 display: flex; | 149 display: flex; |
145 position: absolute; | 150 position: absolute; |
146 right: 16px; | 151 right: 16px; |
147 } | 152 } |
148 | 153 |
149 :host-context([dir='rtl']) #actions { | 154 :host-context([dir='rtl']) #actions { |
150 left: 16px; | 155 left: 16px; |
151 right: auto; | 156 right: auto; |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
192 <div id="icons"> | 197 <div id="icons"> |
193 <div id="wrapper"> | 198 <div id="wrapper"> |
194 <template is="dom-repeat" items="[[availableIconUrls_]]"> | 199 <template is="dom-repeat" items="[[availableIconUrls_]]"> |
195 <paper-button toggles on-tap="onIconTap_" data-icon-url$="[[item]]" | 200 <paper-button toggles on-tap="onIconTap_" data-icon-url$="[[item]]" |
196 active="[[isActiveIcon_(item, profileIconUrl_)]]"> | 201 active="[[isActiveIcon_(item, profileIconUrl_)]]"> |
197 <img src="[[item]]"> | 202 <img src="[[item]]"> |
198 </paper-button> | 203 </paper-button> |
199 </template> | 204 </template> |
200 </div> | 205 </div> |
201 </div> | 206 </div> |
202 <template is="dom-if" if="[[isSignedIn_(signedInUsers_)]]"> | 207 <div id="supervised-user-container"> |
203 <div id="supervised-user-container"> | 208 <paper-checkbox checked="{{isSupervised_}}"> |
204 <paper-checkbox checked="{{isSupervised_}}"> | 209 [[i18n('manageProfilesSupervisedSignedInLabel')]] |
205 [[i18n('manageProfilesSupervisedSignedInLabel')]] | 210 </paper-checkbox> |
206 </paper-checkbox> | 211 <a id="learn-more" is="action-link" on-tap="onLearnMoreTap_"> |
207 <div id="learn-more-accounts"> | 212 [[i18n('learnMore')]] |
208 <a id="learn-more" is="action-link" on-tap="onLearnMoreTap_"> | 213 </a> |
209 [[i18n('learnMore')]] | 214 <div id="custodians"> |
tommycli
2016/05/02 19:10:13
If you can use -webkit-padding-start, you can get
Moe
2016/05/02 20:34:56
Done. However, removing this this would require ad
| |
210 </a> | 215 <template is="dom-if" if="[[isSupervised_]]"> |
211 <template is="dom-if" if="[[isSupervised_]]"> | 216 <template is="dom-if" if="[[isSignedIn_(signedInUsers_)]]"> |
212 <paper-dropdown-menu no-label-float> | 217 <paper-dropdown-menu no-label-float> |
213 <paper-menu class="dropdown-content" | 218 <paper-menu class="dropdown-content" |
214 selected="{{signedInUserIndex_}}" | 219 selected="{{signedInUserIndex_}}" |
215 attr-for-selected="data-user-index"> | 220 attr-for-selected="data-user-index"> |
216 <paper-item data-user-index$="[[NO_USER_SELECTED]]"> | 221 <paper-item data-user-index$="[[NO_USER_SELECTED]]"> |
217 [[i18n('selectAnAccount')]] | 222 [[i18n('selectAnAccount')]] |
218 </paper-item> | 223 </paper-item> |
219 <template is="dom-repeat" items="[[signedInUsers_]]"> | 224 <template is="dom-repeat" items="[[signedInUsers_]]"> |
220 <paper-item data-user-index$="[[index]]"> | 225 <paper-item data-user-index$="[[index]]"> |
221 [[item.username]] | 226 [[item.username]] |
222 </paper-item> | 227 </paper-item> |
223 </template> | 228 </template> |
224 </paper-menu> | 229 </paper-menu> |
225 </paper-dropdown-menu> | 230 </paper-dropdown-menu> |
226 <a id="import-user" is="action-link" on-tap="onImportUserTap_" | 231 <a id="import-user" is="action-link" on-tap="onImportUserTap_" |
227 hidden="[[isImportUserLinkHidden_(createInProgress_, | 232 hidden="[[isImportUserLinkHidden_(createInProgress_, |
228 signedInUserIndex_)]]"> | 233 signedInUserIndex_)]]"> |
229 [[i18n('importExistingSupervisedUserLink')]] | 234 [[i18n('importExistingSupervisedUserLink')]] |
230 </a> | 235 </a> |
231 </template> | 236 </template> |
232 </div> | 237 <div id="sign-in-howto-message" |
238 hidden="[[isSignedIn_(signedInUsers_)]]" | |
239 inner-h-t-m-l="[[i18n('noSignedInUserMessage')]]"> | |
240 </div> | |
241 </template> | |
233 </div> | 242 </div> |
234 </template> | 243 </div> |
235 <div id="actions"> | 244 <div id="actions"> |
236 <paper-spinner active="[[createInProgress_]]"></paper-spinner> | 245 <paper-spinner active="[[createInProgress_]]"></paper-spinner> |
237 <paper-button id="cancel" on-tap="onCancelTap_" i18n-content="cancel"> | 246 <paper-button id="cancel" on-tap="onCancelTap_" i18n-content="cancel"> |
238 </paper-button> | 247 </paper-button> |
239 <paper-button id="save" on-tap="onSaveTap_" | 248 <paper-button id="save" on-tap="onSaveTap_" |
240 i18n-content="createProfileConfirm" | 249 i18n-content="createProfileConfirm" |
241 disabled="[[isSaveDisabled_(createInProgress_, profileName_)]]"> | 250 disabled="[[isSaveDisabled_(createInProgress_, profileName_)]]"> |
242 </paper-button> | 251 </paper-button> |
243 </div> | 252 </div> |
244 <import-supervised-user id="importUserPopup"></import-supervised-user> | 253 <import-supervised-user id="importUserPopup"></import-supervised-user> |
245 </div> | 254 </div> |
246 </template> | 255 </template> |
247 <script src="chrome://md-user-manager/create_profile.js"></script> | 256 <script src="chrome://md-user-manager/create_profile.js"></script> |
248 </dom-module> | 257 </dom-module> |
OLD | NEW |