Chromium Code Reviews Chromium Code Reviews
Issue 2323813002:
MD User Manager: Displays indicators properly when a pod is both child and locked. (Closed)
| OLD | NEW |
|---|---|
| 1 <!doctype html> | 1 <!doctype html> |
| 2 <html build="$i18n{buildType}" | 2 <html build="$i18n{buildType}" |
| 3 dir="$i18n{textdirection}" | 3 dir="$i18n{textdirection}" |
| 4 lang="$i18n{language}" | 4 lang="$i18n{language}" |
| 5 screen="$i18n{screenType}"> | 5 screen="$i18n{screenType}"> |
| 6 <head> | 6 <head> |
| 7 <meta charset="utf-8"> | 7 <meta charset="utf-8"> |
| 8 <meta name="google" value="notranslate"> | 8 <meta name="google" value="notranslate"> |
| 9 <title>$i18n{title}</title> | 9 <title>$i18n{title}</title> |
| 10 | 10 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 120 .pod .main-pane .name-container .name, | 120 .pod .main-pane .name-container .name, |
| 121 .reauth-hint-container .reauth-name-hint { | 121 .reauth-hint-container .reauth-name-hint { |
| 122 color: inherit; | 122 color: inherit; |
| 123 font-size: inherit; | 123 font-size: inherit; |
| 124 margin: 0; | 124 margin: 0; |
| 125 padding: 0; | 125 padding: 0; |
| 126 text-align: initial; | 126 text-align: initial; |
| 127 width: 120px; | 127 width: 120px; |
| 128 } | 128 } |
| 129 | 129 |
| 130 .pod.locked.child .name-container .name { | |
| 131 width: 92px; | |
| 132 } | |
| 133 | |
| 130 .pod .indicator-container { | 134 .pod .indicator-container { |
| 131 bottom: 10px; | 135 bottom: 10px; |
| 132 height: 20px; | 136 display: flex; |
| 133 left: auto; | 137 left: auto; |
| 134 position: absolute; | 138 position: absolute; |
| 135 right: 10px; | 139 right: 10px; |
| 136 top: auto; | 140 top: auto; |
| 137 width: 20px; | |
| 138 } | 141 } |
| 139 | 142 |
| 140 html[dir='rtl'] .pod .indicator-container { | 143 html[dir='rtl'] .pod .indicator-container { |
| 141 left: 10px; | 144 left: 10px; |
| 142 right: auto; | 145 right: auto; |
| 143 } | 146 } |
| 144 | 147 |
| 145 /* Using -webkit-mask on the indicators allows us to tweak the color. */ | 148 /* Using -webkit-mask on the indicators allows us to tweak the color. */ |
| 146 .pod .indicator-container > .indicator { | 149 .pod .indicator-container > .indicator { |
| 147 -webkit-mask-position: center; | 150 -webkit-mask-position: center; |
| 148 -webkit-mask-repeat: no-repeat; | 151 -webkit-mask-repeat: no-repeat; |
| 149 -webkit-mask-size: 16px; | 152 -webkit-mask-size: 16px; |
| 150 background: var(--paper-grey-600); | 153 background: var(--paper-grey-600); |
| 151 display: none; | 154 display: none; |
| 152 height: 100%; | 155 height: 100%; |
|
michaelpg
2016/09/08 16:27:51
remove
Moe
2016/09/08 17:15:56
oops... done.
| |
| 156 height: 20px; | |
| 157 width: 20px; | |
| 153 } | 158 } |
| 154 | 159 |
| 155 .pod.locked .locked-indicator { | 160 .pod.locked .locked-indicator { |
| 156 -webkit-mask-image: url(../../../../ui/webui/resources/images/lock.svg); | 161 -webkit-mask-image: url(../../../../ui/webui/resources/images/lock.svg); |
| 157 display: block; | 162 display: block; |
| 158 } | 163 } |
| 159 | 164 |
| 165 .pod.locked.child .locked-indicator { | |
| 166 -webkit-margin-start: 8px; | |
| 167 } | |
| 168 | |
| 160 .pod.legacy-supervised .legacy-supervised-indicator { | 169 .pod.legacy-supervised .legacy-supervised-indicator { |
| 161 -webkit-mask-image: | 170 -webkit-mask-image: |
| 162 url(../../../../ui/webui/resources/images/supervisor_account.svg); | 171 url(../../../../ui/webui/resources/images/supervisor_account.svg); |
| 163 display: block; | 172 display: block; |
| 164 } | 173 } |
| 165 | 174 |
| 166 .pod.child .child-indicator { | 175 .pod.child .child-indicator { |
| 167 -webkit-mask-image: | 176 -webkit-mask-image: |
| 168 url(../../../../ui/webui/resources/images/account_child_invert.svg); | 177 url(../../../../ui/webui/resources/images/account_child_invert.svg); |
| 169 display: block; | 178 display: block; |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 316 </div> | 325 </div> |
| 317 <div id="bubble" class="bubble faded" hidden></div> | 326 <div id="bubble" class="bubble faded" hidden></div> |
| 318 <control-bar id="login-header-bar"></control-bar> | 327 <control-bar id="login-header-bar"></control-bar> |
| 319 <error-dialog></error-dialog> | 328 <error-dialog></error-dialog> |
| 320 <include src="../../../../ui/login/account_picker/user_pod_template.html"> | 329 <include src="../../../../ui/login/account_picker/user_pod_template.html"> |
| 321 </user-manager-pages> | 330 </user-manager-pages> |
| 322 <link rel="import" href="chrome://resources/html/i18n_template.html"> | 331 <link rel="import" href="chrome://resources/html/i18n_template.html"> |
| 323 <script src="user_manager.js"></script> | 332 <script src="user_manager.js"></script> |
| 324 </body> | 333 </body> |
| 325 </html> | 334 </html> |
| OLD | NEW |
