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

Side by Side Diff: chrome/browser/resources/md_user_manager/create_profile.html

Issue 1939933002: MD User Manager: Supervised user checkbox is always displaying (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md-user-manager-stylesheets
Patch Set: Fixed broken browser test Created 4 years, 7 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
OLDNEW
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 #title-bar { 54 #title-bar {
55 border-bottom: 1px solid rgba(0, 0, 0, .12); 55 border-bottom: 1px solid rgba(0, 0, 0, .12);
56 font-size: 16px; 56 font-size: 16px;
57 font-weight: 500; 57 font-weight: 500;
58 padding: 104px 0 16px; 58 padding: 104px 0 16px;
59 } 59 }
60 60
61 #nameInput, 61 #nameInput,
62 paper-dropdown-menu { 62 paper-dropdown-menu {
63 --paper-input-container: {
64 padding: 0;
65 };
66 --paper-input-container-input: { 63 --paper-input-container-input: {
67 color: inherit; 64 color: inherit;
68 font-size: inherit; 65 font-size: inherit;
69 }; 66 };
70 } 67 }
71 68
72 #nameInput { 69 #nameInput {
73 margin-bottom: 24px; 70 margin-bottom: 24px;
74 margin-top: 32px; 71 margin-top: 32px;
75 width: 300px; 72 width: 300px;
76 } 73 }
77 74
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 { 75 #icons #wrapper {
99 display: flex; 76 display: flex;
100 flex-wrap: wrap; 77 flex-wrap: wrap;
101 margin: -12px; 78 margin: -12px;
102 } 79 }
103 80
104 #icons paper-button { 81 #icons paper-button {
105 background: var(--paper-grey-300); 82 background: var(--paper-grey-300);
106 border: 1px solid rgba(0, 0, 0, .12); 83 border: 1px solid rgba(0, 0, 0, .12);
107 margin: 12px; 84 margin: 12px;
108 min-width: 0; 85 min-width: 0;
109 padding: 6px 4px; 86 padding: 6px 4px;
110 } 87 }
111 88
112 #icons paper-button[active] { 89 #icons paper-button[active] {
113 border-color: var(--google-blue-500); 90 border-color: var(--google-blue-500);
114 } 91 }
115 92
116 #icons paper-button:focus:not([active]) { 93 #icons paper-button:focus:not([active]) {
117 outline: 1px dotted #666; 94 outline: 1px dotted #666;
118 } 95 }
119 96
120 #supervised-user-container { 97 paper-checkbox {
98 --paper-checkbox-label-spacing: 16px;
99 --paper-checkbox-size: 20px;
100 --primary-text-color: var(--paper-grey-800);
121 margin-top: 24px; 101 margin-top: 24px;
122 } 102 }
123 103
124 #supervised-user-container paper-checkbox { 104 #supervised-user-container {
125 --paper-checkbox-label-spacing: 16px; 105 -webkit-padding-start: 36px;
126 --paper-checkbox-size: 20px;
127 }
128
129 #supervised-user-container #learn-more-accounts {
130 -webkit-margin-start: 36px;
131 } 106 }
132 107
133 #supervised-user-container #learn-more { 108 #supervised-user-container #learn-more {
134 display: block;
135 line-height: 20px; 109 line-height: 20px;
136 } 110 }
137 111
112 #supervised-user-container paper-dropdown-menu {
113 margin-top: 4px;
114 width: 200px;
115 }
116
117 #supervised-user-container paper-menu {
118 --paper-menu: {
119 color: inherit;
120 padding: 0;
121 };
122 --paper-menu-selected-item: {
123 font-weight: normal;
124 };
125 }
126
127 #supervised-user-container paper-menu paper-item {
128 font-size: inherit;
129 min-height: 40px;
130 }
131
138 #supervised-user-container #import-user { 132 #supervised-user-container #import-user {
139 -webkit-margin-start: 16px; 133 -webkit-margin-start: 16px;
140 } 134 }
141 135
136 #supervised-user-container #sign-in-howto-message {
137 margin-top: 12px;
138 }
139
142 #actions { 140 #actions {
143 bottom: 16px; 141 bottom: 16px;
144 display: flex; 142 display: flex;
145 position: absolute; 143 position: absolute;
146 right: 16px; 144 right: 16px;
147 } 145 }
148 146
149 :host-context([dir='rtl']) #actions { 147 :host-context([dir='rtl']) #actions {
150 left: 16px; 148 left: 16px;
151 right: auto; 149 right: auto;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 <div id="icons"> 190 <div id="icons">
193 <div id="wrapper"> 191 <div id="wrapper">
194 <template is="dom-repeat" items="[[availableIconUrls_]]"> 192 <template is="dom-repeat" items="[[availableIconUrls_]]">
195 <paper-button toggles on-tap="onIconTap_" data-icon-url$="[[item]]" 193 <paper-button toggles on-tap="onIconTap_" data-icon-url$="[[item]]"
196 active="[[isActiveIcon_(item, profileIconUrl_)]]"> 194 active="[[isActiveIcon_(item, profileIconUrl_)]]">
197 <img src="[[item]]"> 195 <img src="[[item]]">
198 </paper-button> 196 </paper-button>
199 </template> 197 </template>
200 </div> 198 </div>
201 </div> 199 </div>
202 <template is="dom-if" if="[[isSignedIn_(signedInUsers_)]]"> 200 <paper-checkbox checked="{{isSupervised_}}">
203 <div id="supervised-user-container"> 201 [[i18n('manageProfilesSupervisedSignedInLabel')]]
204 <paper-checkbox checked="{{isSupervised_}}"> 202 </paper-checkbox>
205 [[i18n('manageProfilesSupervisedSignedInLabel')]] 203 <div id="supervised-user-container">
206 </paper-checkbox> 204 <div id="learn-more" >
207 <div id="learn-more-accounts"> 205 <a is="action-link" on-tap="onLearnMoreTap_">[[i18n('learnMore')]]</a>
208 <a id="learn-more" is="action-link" on-tap="onLearnMoreTap_"> 206 <div>
209 [[i18n('learnMore')]] 207 <template is="dom-if" if="[[isSupervised_]]">
208 <template is="dom-if" if="[[isSignedIn_(signedInUsers_)]]">
209 <paper-dropdown-menu no-label-float>
210 <paper-menu class="dropdown-content"
dpapad 2016/05/03 17:30:26 Could this paper-menu be swapped with the lighter
Moe 2016/05/03 20:30:10 yep. Done!
211 selected="{{signedInUserIndex_}}"
212 attr-for-selected="data-user-index">
213 <paper-item data-user-index$="[[NO_USER_SELECTED]]">
214 [[i18n('selectAnAccount')]]
215 </paper-item>
216 <template is="dom-repeat" items="[[signedInUsers_]]">
217 <paper-item data-user-index$="[[index]]">
218 [[item.username]]
219 </paper-item>
220 </template>
221 </paper-menu>
222 </paper-dropdown-menu>
223 <a id="import-user" is="action-link" on-tap="onImportUserTap_"
224 hidden="[[isImportUserLinkHidden_(createInProgress_,
225 signedInUserIndex_)]]">
226 [[i18n('importExistingSupervisedUserLink')]]
210 </a> 227 </a>
211 <template is="dom-if" if="[[isSupervised_]]"> 228 </template>
212 <paper-dropdown-menu no-label-float> 229 <div id="sign-in-howto-message"
213 <paper-menu class="dropdown-content" 230 hidden="[[isSignedIn_(signedInUsers_)]]"
214 selected="{{signedInUserIndex_}}" 231 inner-h-t-m-l="[[i18n('noSignedInUserMessage')]]">
215 attr-for-selected="data-user-index">
216 <paper-item data-user-index$="[[NO_USER_SELECTED]]">
217 [[i18n('selectAnAccount')]]
218 </paper-item>
219 <template is="dom-repeat" items="[[signedInUsers_]]">
220 <paper-item data-user-index$="[[index]]">
221 [[item.username]]
222 </paper-item>
223 </template>
224 </paper-menu>
225 </paper-dropdown-menu>
226 <a id="import-user" is="action-link" on-tap="onImportUserTap_"
227 hidden="[[isImportUserLinkHidden_(createInProgress_,
228 signedInUserIndex_)]]">
229 [[i18n('importExistingSupervisedUserLink')]]
230 </a>
231 </template>
232 </div> 232 </div>
233 </div> 233 </template>
234 </template> 234 </div>
235 <div id="actions"> 235 <div id="actions">
236 <paper-spinner active="[[createInProgress_]]"></paper-spinner> 236 <paper-spinner active="[[createInProgress_]]"></paper-spinner>
237 <paper-button id="cancel" on-tap="onCancelTap_" i18n-content="cancel"> 237 <paper-button id="cancel" on-tap="onCancelTap_" i18n-content="cancel">
238 </paper-button> 238 </paper-button>
239 <paper-button id="save" on-tap="onSaveTap_" 239 <paper-button id="save" on-tap="onSaveTap_"
240 i18n-content="createProfileConfirm" 240 i18n-content="createProfileConfirm"
241 disabled="[[isSaveDisabled_(createInProgress_, profileName_)]]"> 241 disabled="[[isSaveDisabled_(createInProgress_, profileName_)]]">
242 </paper-button> 242 </paper-button>
243 </div> 243 </div>
244 <import-supervised-user id="importUserPopup"></import-supervised-user> 244 <import-supervised-user id="importUserPopup"></import-supervised-user>
245 </div> 245 </div>
246 </template> 246 </template>
247 <script src="chrome://md-user-manager/create_profile.js"></script> 247 <script src="chrome://md-user-manager/create_profile.js"></script>
248 </dom-module> 248 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698