Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* Copyright 2016 The Chromium Authors. All rights reserved. | 1 /* Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 * Use of this source code is governed by a BSD-style license that can be | 2 * Use of this source code is governed by a BSD-style license that can be |
| 3 * found in the LICENSE file. */ | 3 * found in the LICENSE file. */ |
| 4 | 4 |
| 5 body { | 5 body { |
| 6 font-family: Roboto; | 6 font-family: Roboto; |
| 7 } | 7 } |
| 8 | 8 |
| 9 /* Overrides for the desktop user manager screen. */ | 9 /* Overrides for the desktop user manager screen. */ |
| 10 | 10 |
| 11 .oobe-display { | 11 .oobe-display { |
| 12 background-color: #eee; | 12 background-color: #eee; |
| 13 } | 13 } |
| 14 | 14 |
| 15 #outer-container { | 15 #outer-container { |
| 16 min-height: 0; | 16 min-height: 0; |
| 17 overflow: auto; | |
| 18 } | |
| 19 | |
| 20 #oobe { | |
| 21 margin-bottom: 10px; | |
| 22 margin-top: 40px; | |
| 23 } | |
| 24 | |
| 25 #outer-container::-webkit-scrollbar { | |
| 26 height: 0; | |
| 27 width: 0; | |
| 17 } | 28 } |
| 18 | 29 |
| 19 .bubble.faded { | 30 .bubble.faded { |
| 20 opacity: 0; | 31 opacity: 0; |
| 21 } | 32 } |
| 22 | 33 |
| 34 control-bar { | |
|
tommycli
2016/02/20 00:36:39
Absolute positioning is generally speaking a last
Moe
2016/02/22 14:46:45
Acknowledged.
| |
| 35 bottom: 0; | |
| 36 left: 0; | |
| 37 position: absolute; | |
| 38 right: 0; | |
| 39 z-index: 1; | |
| 40 } | |
| 41 | |
| 42 #login-header-bar.shadow { | |
| 43 box-shadow: 0 -1px 3px rgba(0, 0, 0, .2); | |
| 44 } | |
| 45 | |
| 23 .pod { | 46 .pod { |
| 24 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); | 47 box-shadow: |
| 25 height: 226px; | 48 0 2px 2px 0 rgba(0, 0, 0, .24), |
|
tommycli
2016/03/03 19:49:40
Can all these shadows (in the whole file) be norma
| |
| 26 /* On non-retina desktop, the text is blurry if we use the scale3d() | 49 0 0 2px 0 rgba(0, 0, 0, .12); |
| 27 inherited from user_pod_row.js */ | 50 cursor: default; |
|
tommycli
2016/02/20 00:36:38
Is this necessary?
Moe
2016/02/22 14:46:45
Acknowledged.
| |
| 28 transform: scale(0.9); | 51 height: auto; |
| 29 } | 52 transform: none; |
|
tommycli
2016/02/20 00:36:38
And this?
Moe
2016/02/22 14:46:45
Acknowledged.
| |
| 30 | 53 width: auto; |
| 31 podrow[ncolumns='6'] .pod { | 54 } |
| 32 transform: scale(0.8); | 55 |
| 33 } | |
| 34 | |
| 35 /* Because of crbug.com/406529, the text in the .name div is janky if there's | |
| 36 both a transform:scale and a transition:opacity applied to a div, so we must | |
| 37 apply the opacity change to the children instead. */ | |
| 38 .pod.faded { | 56 .pod.faded { |
| 39 opacity: 1; | 57 opacity: 1; |
| 40 } | 58 } |
| 41 | 59 |
| 42 .pod.faded .user-image-pane, | 60 .pod.focused, |
| 43 .pod.faded .main-pane { | 61 .pod.hovered { |
| 44 opacity: .4; | 62 box-shadow: |
| 45 } | 63 0 10px 10px 0 rgba(0, 0, 0, .26), |
| 46 | 64 0 14px 28px 0 rgba(0, 0, 0, .25) !important; |
| 47 .pod.hovered:not(.focused) { | |
| 48 box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); | |
| 49 } | |
| 50 | |
| 51 .pod.focused { | |
| 52 box-shadow: 0 16px 21px rgba(0, 0, 0, 0.2); | |
| 53 transform: scale(1) !important; | |
| 54 } | 65 } |
| 55 | 66 |
| 56 .pod.focused.locked { | 67 .pod.focused.locked { |
| 57 box-shadow: 0 12px 21px rgba(0, 0, 0, 0.2); | 68 box-shadow: 0 12px 21px rgba(0, 0, 0, .2); |
| 58 height: 220px; | 69 height: auto; |
| 59 } | 70 } |
| 60 | 71 |
| 61 .user-image-pane { | 72 .pod .user-image-pane { |
| 62 border-top-left-radius: 2px; | 73 border-top-left-radius: 2px; |
| 63 border-top-right-radius: 2px; | 74 border-top-right-radius: 2px; |
| 64 height: 180px; | 75 position: static; |
|
tommycli
2016/02/20 00:36:38
The default value is static right? Is this also ne
Moe
2016/02/22 14:46:45
Acknowledged.
| |
| 65 left: 0; | |
| 66 top: 0; | |
| 67 width: 180px; | |
| 68 } | |
| 69 | |
| 70 html[dir=rtl] .user-image-pane { | |
| 71 right: 0; | |
| 72 } | |
| 73 | |
| 74 .pod .name { | |
| 75 margin-top: 12px; | |
| 76 } | 76 } |
| 77 | 77 |
| 78 .pod .user-image { | 78 .pod .user-image { |
| 79 height: 180px; | 79 height: 160px; |
| 80 width: 180px; | 80 width: 160px; |
| 81 } | 81 } |
| 82 | 82 |
| 83 .pod input[type='password'] { | 83 .pod .main-pane { |
| 84 height: 45px; /* 1px shorter as to not overlap the pod's rounded corners */ | 84 line-height: 20px; |
| 85 top: 1px; | 85 padding: 10px; |
| 86 position: static; | |
|
tommycli
2016/02/20 00:36:38
same comment as above
Moe
2016/02/22 14:46:45
Acknowledged.
| |
| 87 } | |
| 88 | |
| 89 .pod .main-pane .name-container { | |
| 90 display: block; | |
| 91 position: static; | |
|
tommycli
2016/02/20 00:36:39
and here
Moe
2016/02/22 14:46:45
Acknowledged.
| |
| 92 width: auto; | |
| 93 } | |
| 94 | |
| 95 .pod .main-pane .name-container .name { | |
| 96 color: #333; | |
| 97 font-size: 13px; | |
| 98 margin: 0; | |
| 99 padding: 0; | |
| 100 text-align: left; | |
|
tommycli
2016/02/20 00:36:38
So I thought the default text-align is left if it'
Moe
2016/02/22 14:46:45
+1 Done!
| |
| 101 width: 118px; | |
| 102 } | |
| 103 | |
| 104 html[dir='rtl'] .pod .main-pane .name-container .name { | |
| 105 text-align: right; | |
| 86 } | 106 } |
| 87 | 107 |
| 88 .pod .indicator-container { | 108 .pod .indicator-container { |
| 89 background-color: rgba(255, 255, 255, 0.85); | 109 background-color: rgba(255, 255, 255, .85); |
| 90 border-radius: 16px; | 110 border-radius: 0; |
| 91 height: 32px; | 111 bottom: 10px; |
| 92 left: 8px; | 112 height: 20px; |
| 93 position: absolute; | |
| 94 top: 8px; | |
| 95 } | |
| 96 | |
| 97 html[dir=rtl] .pod .indicators { | |
| 98 left: auto; | 113 left: auto; |
| 99 right: 8px; | 114 position: absolute; |
| 100 } | 115 right: 10px; |
| 101 | 116 top: auto; |
| 102 .pod .indicator { | 117 width: 20px; |
| 118 } | |
| 119 | |
| 120 html[dir='rtl'] .pod .indicator-container { | |
| 121 left: 10px; | |
| 122 right: auto; | |
| 123 } | |
| 124 | |
| 125 /* Using -webkit-mask on the indicators allows us to tweak the color. */ | |
| 126 .pod .indicator-container > .indicator { | |
| 127 -webkit-mask-position: center; | |
| 128 -webkit-mask-repeat: no-repeat; | |
| 129 -webkit-mask-size: 20px; | |
| 130 background-color: rgb(150, 150, 150); | |
|
tommycli
2016/02/20 00:36:38
Can this be one of the standard --paper or --googl
Moe
2016/02/22 14:46:45
unfortunately this one isn't one of those greys ei
tommycli
2016/03/03 19:49:40
--paper-grey-500 is 9e9e9e aka rgb(158, 158, 158).
| |
| 103 background-position: center; | 131 background-position: center; |
| 104 background-repeat: no-repeat; | 132 background-repeat: no-repeat; |
| 105 background-size: 18px; | 133 background-size: 18px; |
| 106 display: none; | 134 display: none; |
| 107 float: left; | 135 float: left; |
| 108 height: 32px; | 136 height: 20px; |
| 109 width: 32px; | 137 width: 20px; |
| 110 } | |
| 111 | |
| 112 /* Using -webkit-mask on the indicators allows us to tweak the color. */ | |
| 113 .pod .indicator-container > div { | |
| 114 -webkit-mask-position: center; | |
| 115 -webkit-mask-repeat: no-repeat; | |
| 116 -webkit-mask-size: 24px; | |
| 117 } | 138 } |
| 118 | 139 |
| 119 .pod.locked .locked-indicator { | 140 .pod.locked .locked-indicator { |
| 120 -webkit-mask-image: url(../../../../ui/webui/resources/images/lock.svg); | 141 -webkit-mask-image: url(../../../../ui/webui/resources/images/lock.svg); |
| 121 background-color: var(--paper-grey-600); | |
| 122 display: initial; | 142 display: initial; |
| 123 } | 143 } |
| 124 | 144 |
| 125 .pod.legacy-supervised .legacy-supervised-indicator { | 145 .pod.legacy-supervised .legacy-supervised-indicator { |
| 126 -webkit-mask-image: | 146 -webkit-mask-image: |
| 127 url(../../../../ui/webui/resources/images/supervisor_account.svg); | 147 url(../../../../ui/webui/resources/images/supervisor_account.svg); |
| 128 background-color: var(--google-blue-500); | |
| 129 display: initial; | 148 display: initial; |
| 130 } | 149 } |
| 131 | 150 |
| 132 .pod.child .child-indicator { | 151 .pod.child .child-indicator { |
| 133 -webkit-mask-image: | 152 -webkit-mask-image: |
| 134 url(../../../../ui/webui/resources/images/account_child_invert.svg); | 153 url(../../../../ui/webui/resources/images/account_child_invert.svg); |
| 135 background-color: var(--google-blue-500); | |
| 136 display: initial; | 154 display: initial; |
| 137 } | 155 } |
| 138 | 156 |
| 139 .main-pane { | 157 .action-box-area { |
| 140 left: 0; | 158 background-color: transparent; |
| 159 background-image: linear-gradient(rgba(0, 0, 0, .4), rgba(0, 0, 0, 0) 100%); | |
| 160 border-radius: 0; | |
| 161 height: 56px; | |
| 162 outline: none; | |
| 163 position: absolute; | |
|
tommycli
2016/02/20 00:36:38
Can this be done without absolute positioning?
Moe
2016/02/22 14:46:45
Acknowledged.
| |
| 141 top: 0; | 164 top: 0; |
| 142 } | |
| 143 | |
| 144 html[dir=rtl] .main-pane { | |
| 145 right: 0; | |
| 146 } | |
| 147 | |
| 148 .name-container, | |
| 149 .pod.focused:not(.multiprofiles-policy-applied) .auth-container { | |
| 150 top: 180px; | |
| 151 width: 180px; | |
| 152 } | |
| 153 | |
| 154 .pod.focused:not(.locked) .name-container { | |
| 155 display: block; | |
| 156 } | |
| 157 | |
| 158 .pod .name { | |
| 159 color: rgb(54, 54, 54); | |
| 160 font-size: 15px; | |
| 161 margin-top: 11px; | |
| 162 } | |
| 163 | |
| 164 .pod.focused:not(.locked) .auth-container { | |
| 165 display: none; | |
| 166 } | |
| 167 | |
| 168 .pod[auth-type='offlinePassword'].focused.locked .password-entry-container { | |
| 169 display: flex; | |
| 170 flex: auto; | |
| 171 } | |
| 172 | |
| 173 .action-box-area { | |
| 174 background-color: var(--google-grey-100); | |
| 175 height: 24px; | |
| 176 /* Because of crbug.com/406529, the text in the .name div is janky if there's | 165 /* Because of crbug.com/406529, the text in the .name div is janky if there's |
| 177 an opacity transition in this div. */ | 166 an opacity transition in this div. */ |
| 178 transition: none; | 167 transition: none; |
| 179 width: 24px; | 168 width: 100%; |
| 180 } | 169 z-index: 1; |
| 181 | 170 } |
| 182 .action-box-button, | 171 |
| 183 .action-box-button:hover, | 172 .action-box-area.menu-moved-up { |
| 173 -webkit-transform: none; | |
| 174 } | |
| 175 | |
| 176 .action-box-area .action-box-button { | |
| 177 display: none; | |
| 178 } | |
| 179 | |
| 180 .action-box-area .action-box-icon { | |
| 181 border: none; | |
| 182 color: #fff; | |
|
tommycli
2016/02/20 00:36:38
just 'white' might be better here
Moe
2016/02/22 14:46:45
Done.
| |
| 183 display: inline-flex; | |
| 184 left: auto; | |
| 185 margin: 0; | |
| 186 position: absolute; | |
| 187 right: -1px; | |
| 188 top: 4px; | |
| 189 } | |
| 190 | |
| 191 .pod.focused:not(.locked) .auth-container { | |
| 192 display: none; | |
| 193 } | |
| 194 | |
| 195 .pod.focused:not(.multiprofiles-policy-applied) .auth-container { | |
| 196 left: 0; | |
| 197 } | |
| 198 | |
| 199 .pod .auth-container { | |
| 200 font-size: 13px; | |
| 201 } | |
| 202 | |
| 203 .pod .auth-container input[type='password'] { | |
| 204 height: 40px; | |
| 205 line-height: 20px; | |
| 206 padding: 10px; | |
| 207 top: 0; | |
| 208 } | |
| 209 | |
| 210 .pod[auth-type='onlineSignIn'] .reauth-hint-container { | |
| 211 margin: 0; | |
| 212 padding: 10px 0; | |
| 213 } | |
| 214 | |
| 215 .reauth-hint-container .reauth-warning { | |
| 216 height: 20px; | |
| 217 width: 20px; | |
| 218 } | |
| 219 | |
| 220 .reauth-hint-container .reauth-name-hint { | |
| 221 color: #333; | |
|
tommycli
2016/02/20 00:36:38
Does a --paper-grey work here?
Moe
2016/02/22 14:46:45
I can't find this in paper-styles/color.html eithe
tommycli
2016/03/03 19:49:40
See above comment. I'm think material design requi
| |
| 222 font-size: 13px; | |
| 223 } | |
| 224 | |
| 184 .action-box-area.active .action-box-button { | 225 .action-box-area.active .action-box-button { |
| 185 background-image: none; | 226 display: none; |
| 186 border-left: 6px solid transparent; | 227 } |
| 187 border-right: 6px solid transparent; | 228 |
| 188 border-top: 6px solid #989898; | 229 .action-box-area.active ~ .action-box-menu:not(.menu-moved-up) { |
| 189 height: 0; | 230 top: 8px; |
| 190 left: 6px; | 231 } |
| 191 margin: 0; | 232 |
| 192 position: absolute; | 233 .action-box-area.active ~ .action-box-menu { |
| 193 top: 9px; | 234 border: none; |
| 194 width: 0; | 235 box-shadow: 0 10px 20px 0 rgba(0, 0, 0, .19); |
| 195 } | 236 line-height: 20px; |
| 196 | 237 right: 8px; |
| 197 .action-box-button:hover, | 238 width: 224px; |
| 198 .action-box-area.active .action-box-button { | 239 } |
| 199 border-top: 6px solid #4c4c4c; | 240 |
| 200 } | 241 html[dir=rtl] .action-box-area.active ~ .action-box-menu { |
| 201 | 242 /* forcing the menu to be positioned as in ltr */ |
| 202 .action-box-remove-user-warning .remove-warning-button { | 243 left: auto; |
| 203 height: 30px; | 244 right: 8px; |
| 204 } | 245 } |
| 205 | 246 |
| 206 .action-box-remove-user-warning .remove-warning-button:focus { | 247 .action-box-menu-title { |
| 207 /* Override the default blue border inherited from | 248 color: #333; |
|
tommycli
2016/02/20 00:36:38
paper-grey?
Moe
2016/02/22 14:46:45
Acknowledged.
| |
| 208 button.custom-appearance:focus. */ | 249 padding: 16px 12px 10px 12px; |
| 209 border: 1px solid transparent !important; | 250 } |
| 210 box-shadow: inset 0 0 0 1px #fff; | 251 |
| 211 } | 252 .action-box-menu-title-name, |
| 253 .action-box-menu-title-email { | |
| 254 height: auto; | |
| 255 line-height: 22px; | |
| 256 } | |
| 257 | |
| 258 .action-box-menu-title-email { | |
| 259 color: rgb(103, 103, 103); | |
|
tommycli
2016/02/20 00:36:38
paper-grey?
Moe
2016/02/22 14:46:45
we have paper-grey for rgb(97,97,97) but not for r
| |
| 260 } | |
| 261 | |
| 262 .action-box-menu-remove { | |
| 263 border-top: 1px solid rgba(0, 0, 0, .12); | |
| 264 color: #333; | |
|
tommycli
2016/02/20 00:36:38
and here
Moe
2016/02/22 14:46:45
Acknowledged.
| |
| 265 line-height: 32px; | |
| 266 min-height: 0; | |
| 267 padding: 8px 12px; | |
| 268 } | |
| 269 | |
| 270 .action-box-remove-user-warning { | |
| 271 border-top: 1px solid rgba(0, 0, 0, .12); | |
| 272 color: #333; | |
|
tommycli
2016/02/20 00:36:38
and here
Moe
2016/02/22 14:46:45
Acknowledged.
| |
| 273 line-height: 20px; | |
| 274 padding: 12px; | |
| 275 } | |
| 276 | |
| 277 .action-box-remove-user-warning { | |
| 278 text-align: center; | |
| 279 } | |
| 280 | |
| 281 .action-box-remove-user-warning > div, | |
| 282 .action-box-remove-user-warning > table { | |
| 283 text-align: left; | |
|
tommycli
2016/02/20 00:36:38
same comment as above: does text-align: initial wo
Moe
2016/02/22 14:46:45
Done.
| |
| 284 word-wrap: break-word; | |
| 285 } | |
| 286 | |
| 287 html[dir='rtl'] .action-box-remove-user-warning > div, | |
| 288 html[dir='rtl'] .action-box-remove-user-warning > table { | |
| 289 text-align: right; | |
| 290 } | |
| 291 | |
| 292 .pod:not(.synced) .action-box-remove-user-warning-text { | |
| 293 font-weight: bold; | |
| 294 } | |
| 295 | |
| 296 .action-box-remove-user-warning paper-button.remove-warning-button { | |
| 297 font-size: 13px; | |
| 298 min-width: 52px; | |
| 299 } | |
| OLD | NEW |