Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://md-user-manager/shared_styles.html"> | 1 <link rel="import" href="chrome://md-user-manager/shared_styles.html"> |
| 2 | 2 |
| 3 <dom-module id="user-manager-styles"> | 3 <dom-module id="user-manager-styles"> |
| 4 <template> | 4 <template> |
| 5 <style include="shared-styles"> | 5 <style include="shared-styles"> |
| 6 body { | 6 body { |
| 7 background-color: #eee; | 7 background-color: var(--paper-grey-200); |
| 8 } | 8 } |
| 9 | 9 |
| 10 /* Overrides for the desktop user manager screen. */ | 10 user-manager-pages, |
| 11 #login-header-bar { | 11 #login-header-bar { |
| 12 bottom: 0; | 12 bottom: 0; |
| 13 left: 0; | 13 left: 0; |
| 14 position: absolute; | 14 position: absolute; |
| 15 right: 0; | 15 right: 0; |
| 16 } | 16 } |
| 17 | 17 |
| 18 user-manager-pages { | |
| 19 top: 0; | |
| 20 } | |
| 21 | |
| 22 #login-header-bar.shadow { | |
| 23 box-shadow: 0 -1px 3px rgba(0, 0, 0, .2); | |
| 24 } | |
| 25 | |
| 26 /* Overrides src/ui/login/screen_container.css for the desktop user | |
| 27 * manager. */ | |
| 28 | |
| 18 #outer-container { | 29 #outer-container { |
| 19 min-height: 0; | 30 min-height: 0; |
| 31 overflow-x: hidden; | |
| 32 overflow-y: auto; | |
| 33 padding-bottom: 40px; | |
| 34 padding-top: 40px; | |
| 35 z-index: initial; | |
| 20 } | 36 } |
| 21 | 37 |
| 22 .bubble.faded { | 38 .bubble.faded { |
| 23 opacity: 0; | 39 opacity: 0; |
| 24 } | 40 } |
| 25 | 41 |
| 26 .pod { | 42 .pod { |
| 27 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); | 43 box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .24), |
| 28 height: 226px; | 44 0 0 2px 0 rgba(0, 0, 0, .12); |
| 29 /* On non-retina desktop, the text is blurry if we use the scale3d() | 45 color: var(--paper-grey-800); |
| 30 inherited from user_pod_row.js */ | 46 cursor: default; |
| 31 transform: scale(0.9); | 47 height: auto; |
| 32 } | 48 transform: none; |
| 33 | 49 width: auto; |
| 34 podrow[ncolumns='6'] .pod { | 50 } |
| 35 transform: scale(0.8); | 51 |
| 36 } | |
| 37 | |
| 38 /* Because of crbug.com/406529, the text in the .name div is janky if ther e's | |
| 39 both a transform:scale and a transition:opacity applied to a div, so we mu st | |
| 40 apply the opacity change to the children instead. */ | |
| 41 .pod.faded { | 52 .pod.faded { |
| 42 opacity: 1; | 53 opacity: 1; |
| 43 } | 54 } |
| 44 | 55 |
| 45 .pod.faded .user-image-pane, | 56 .pod.focused, |
| 46 .pod.faded .main-pane { | 57 .pod.hovered { |
| 47 opacity: .4; | 58 box-shadow: 0 10px 10px 0 rgba(0, 0, 0, .26), |
| 48 } | 59 0 14px 28px 0 rgba(0, 0, 0, .25); |
| 49 | |
| 50 .pod.hovered:not(.focused) { | |
| 51 box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); | |
| 52 } | |
| 53 | |
| 54 .pod.focused { | |
| 55 box-shadow: 0 16px 21px rgba(0, 0, 0, 0.2); | |
| 56 transform: scale(1) !important; | |
| 57 } | 60 } |
| 58 | 61 |
| 59 .pod.focused.locked { | 62 .pod.focused.locked { |
| 60 box-shadow: 0 12px 21px rgba(0, 0, 0, 0.2); | 63 box-shadow: 0 12px 21px rgba(0, 0, 0, .2); |
| 61 height: 220px; | 64 height: auto; |
| 62 } | 65 } |
| 63 | 66 |
| 64 .user-image-pane { | 67 .pod .user-image-pane { |
| 65 border-top-left-radius: 2px; | 68 border-top-left-radius: 2px; |
| 66 border-top-right-radius: 2px; | 69 border-top-right-radius: 2px; |
| 67 height: 180px; | 70 position: static; |
| 68 left: 0; | |
| 69 top: 0; | |
| 70 width: 180px; | |
| 71 } | |
| 72 | |
| 73 html[dir=rtl] .user-image-pane { | |
| 74 right: 0; | |
| 75 } | |
| 76 | |
| 77 .pod .name { | |
| 78 margin-top: 12px; | |
| 79 } | 71 } |
| 80 | 72 |
| 81 .pod .user-image { | 73 .pod .user-image { |
| 82 height: 180px; | 74 height: 160px; |
| 83 width: 180px; | 75 width: 160px; |
| 84 } | 76 } |
| 85 | 77 |
| 86 .pod input[type='password'] { | 78 .pod .main-pane { |
| 87 height: 45px; /* 1px shorter as to not overlap the pod's rounded corner s */ | 79 line-height: 20px; |
| 88 top: 1px; | 80 padding: 10px; |
| 81 position: static; | |
| 82 } | |
| 83 | |
| 84 .pod .main-pane .name-container { | |
| 85 display: block; | |
| 86 position: static; | |
| 87 width: auto; | |
| 88 } | |
| 89 | |
| 90 .pod .main-pane .name-container .name { | |
| 91 color: inherit; | |
| 92 font-size: inherit; | |
| 93 margin: 0; | |
| 94 padding: 0; | |
| 95 text-align: initial; | |
| 96 width: 118px; | |
| 89 } | 97 } |
| 90 | 98 |
| 91 .pod .indicator-container { | 99 .pod .indicator-container { |
| 92 background-color: rgba(255, 255, 255, 0.85); | 100 background-color: rgba(255, 255, 255, .85); |
| 93 border-radius: 16px; | 101 border-radius: 0; |
| 94 height: 32px; | 102 bottom: 10px; |
| 95 left: 8px; | 103 height: 20px; |
| 104 left: auto; | |
| 96 position: absolute; | 105 position: absolute; |
| 97 top: 8px; | 106 right: 10px; |
| 98 } | 107 top: auto; |
| 99 | 108 width: 20px; |
| 100 html[dir=rtl] .pod .indicators { | 109 } |
| 101 left: auto; | 110 |
| 102 right: 8px; | 111 html[dir='rtl'] .pod .indicator-container { |
| 103 } | 112 left: 10px; |
| 104 | 113 right: auto; |
| 105 .pod .indicator { | 114 } |
| 115 | |
| 116 /* Using -webkit-mask on the indicators allows us to tweak the color. */ | |
| 117 .pod .indicator-container > .indicator { | |
| 118 -webkit-mask-position: center; | |
| 119 -webkit-mask-repeat: no-repeat; | |
| 120 -webkit-mask-size: 20px; | |
| 121 background-color: var(--paper-grey-600); | |
| 106 background-position: center; | 122 background-position: center; |
| 107 background-repeat: no-repeat; | 123 background-repeat: no-repeat; |
| 108 background-size: 18px; | 124 background-size: 18px; |
| 109 display: none; | 125 display: none; |
| 110 float: left; | 126 float: left; |
| 111 height: 32px; | 127 height: 20px; |
| 112 width: 32px; | 128 width: 20px; |
| 113 } | |
| 114 | |
| 115 /* Using -webkit-mask on the indicators allows us to tweak the color. */ | |
| 116 .pod .indicator-container > div { | |
| 117 -webkit-mask-position: center; | |
| 118 -webkit-mask-repeat: no-repeat; | |
| 119 -webkit-mask-size: 24px; | |
| 120 } | 129 } |
| 121 | 130 |
| 122 .pod.locked .locked-indicator { | 131 .pod.locked .locked-indicator { |
| 123 -webkit-mask-image: url(../../../../ui/webui/resources/images/lock.svg); | 132 -webkit-mask-image: url(../../../../ui/webui/resources/images/lock.svg); |
| 124 background-color: var(--paper-grey-600); | |
| 125 display: initial; | 133 display: initial; |
| 126 } | 134 } |
| 127 | 135 |
| 128 .pod.legacy-supervised .legacy-supervised-indicator { | 136 .pod.legacy-supervised .legacy-supervised-indicator { |
| 129 -webkit-mask-image: | 137 -webkit-mask-image: |
| 130 url(../../../../ui/webui/resources/images/supervisor_account.svg); | 138 url(../../../../ui/webui/resources/images/supervisor_account.svg); |
| 131 background-color: var(--google-blue-500); | |
| 132 display: initial; | 139 display: initial; |
| 133 } | 140 } |
| 134 | 141 |
| 135 .pod.child .child-indicator { | 142 .pod.child .child-indicator { |
| 136 -webkit-mask-image: | 143 -webkit-mask-image: |
| 137 url(../../../../ui/webui/resources/images/account_child_invert.svg); | 144 url(../../../../ui/webui/resources/images/account_child_invert.svg); |
| 138 background-color: var(--google-blue-500); | 145 display: initial; |
| 139 display: initial; | 146 } |
| 140 } | 147 |
| 141 | 148 .action-box-area:focus ~ .user-image-gradient-area, |
| 142 .main-pane { | 149 .action-box-area.hovered ~ .user-image-gradient-area { |
| 150 background-image: linear-gradient(rgba(0, 0, 0, .4), transparent 100%); | |
| 151 display: initial; | |
| 152 height: 56px; | |
| 153 position: absolute; | |
| 154 top: 0; | |
| 155 width: 100%; | |
| 156 } | |
| 157 | |
| 158 .action-box-area { | |
| 159 background-color: transparent; | |
| 160 } | |
| 161 | |
| 162 .action-box-area.menu-moved-up { | |
| 163 -webkit-transform: none; | |
|
Dan Beam
2016/04/19 21:15:09
nit: transform: none;
Moe
2016/04/20 15:29:38
Done.
| |
| 164 } | |
| 165 | |
| 166 .action-box-area .action-box-button { | |
| 167 display: none; | |
| 168 } | |
| 169 | |
| 170 .action-box-area .action-box-icon { | |
| 171 color: white; | |
| 172 display: inline-flex; | |
| 173 margin-top: 4px; | |
| 174 } | |
| 175 | |
| 176 .pod.focused:not(.locked) .auth-container { | |
| 177 display: none; | |
| 178 } | |
| 179 | |
| 180 .pod.focused:not(.multiprofiles-policy-applied) .auth-container { | |
| 143 left: 0; | 181 left: 0; |
| 182 } | |
| 183 | |
| 184 .pod .auth-container input[type='password'] { | |
| 185 line-height: inherit; | |
| 186 padding: 10px; | |
| 144 top: 0; | 187 top: 0; |
| 145 } | 188 width: 140px; |
| 146 | 189 } |
| 147 html[dir=rtl] .main-pane { | 190 |
| 148 right: 0; | 191 .pod .auth-container input[type='password']:focus { |
| 149 } | 192 outline: 0; |
| 150 | 193 } |
| 151 .name-container, | 194 |
| 152 .pod.focused:not(.multiprofiles-policy-applied) .auth-container { | 195 .pod[auth-type='onlineSignIn'] .reauth-hint-container { |
| 153 top: 180px; | 196 margin: 0; |
| 154 width: 180px; | 197 padding: 10px 0; |
| 155 } | 198 } |
| 156 | 199 |
| 157 .pod.focused:not(.locked) .name-container { | 200 .reauth-hint-container .reauth-warning { |
| 158 display: block; | 201 height: 20px; |
| 159 } | 202 width: 20px; |
| 160 | 203 } |
| 161 .pod .name { | 204 |
| 162 color: var(--paper-grey-800); | 205 .reauth-hint-container .reauth-name-hint { |
| 163 font-size: 15px; | 206 color: inherit; |
| 164 margin-top: 11px; | 207 font-size: inherit; |
| 165 } | 208 } |
| 166 | 209 |
| 167 .pod.focused:not(.locked) .auth-container { | |
| 168 display: none; | |
| 169 } | |
| 170 | |
| 171 .pod[auth-type='offlinePassword'].focused.locked .password-entry-container { | |
| 172 display: flex; | |
| 173 flex: auto; | |
| 174 } | |
| 175 | |
| 176 .action-box-area { | |
| 177 background-color: var(--google-grey-100); | |
| 178 height: 24px; | |
| 179 /* Because of crbug.com/406529, the text in the .name div is janky if th ere's | |
| 180 an opacity transition in this div. */ | |
| 181 transition: none; | |
| 182 width: 24px; | |
| 183 } | |
| 184 | |
| 185 .action-box-button, | |
| 186 .action-box-button:hover, | |
| 187 .action-box-area.active .action-box-button { | 210 .action-box-area.active .action-box-button { |
| 188 background-image: none; | 211 display: none; |
| 189 border-left: 6px solid transparent; | 212 } |
| 190 border-right: 6px solid transparent; | 213 |
| 191 border-top: 6px solid #989898; | 214 .action-box-area.active ~ .action-box-menu:not(.menu-moved-up) { |
| 192 height: 0; | 215 top: 8px; |
| 193 left: 6px; | 216 } |
| 194 margin: 0; | 217 |
| 195 position: absolute; | 218 .action-box-area.active ~ .action-box-menu { |
| 196 top: 9px; | 219 border: none; |
| 197 width: 0; | 220 box-shadow: 0 10px 20px 0 rgba(0, 0, 0, .19); |
| 198 } | 221 right: 8px; |
| 199 | 222 width: 224px; |
| 200 .action-box-button:hover, | 223 } |
| 201 .action-box-area.active .action-box-button { | 224 |
| 202 border-top: 6px solid #4c4c4c; | 225 html[dir=rtl] .action-box-area.active ~ .action-box-menu { |
| 226 left: 8px; | |
|
Dan Beam
2016/04/19 21:15:09
don't you also need a:
right: auto;
here?
Moe
2016/04/20 15:29:38
it's not necessary since user_pod_row.css already
| |
| 227 } | |
| 228 | |
| 229 .action-box-menu-title { | |
| 230 color: inherit; | |
| 231 padding: 16px 12px; | |
| 232 } | |
| 233 | |
| 234 .action-box-menu-title-name, | |
| 235 .action-box-menu-title-email { | |
| 236 height: auto; | |
| 237 } | |
| 238 | |
| 239 .action-box-menu-title-email { | |
| 240 color: var(--paper-grey-600); | |
| 241 } | |
| 242 | |
| 243 .action-box-menu-remove { | |
| 244 border-top: 1px solid rgba(0, 0, 0, .12); | |
| 245 line-height: 32px; | |
| 246 padding: 8px 12px; | |
| 247 } | |
| 248 | |
| 249 .action-box-remove-user-warning { | |
| 250 border-top: 1px solid rgba(0, 0, 0, .12); | |
| 251 font-size: inherit; | |
| 252 line-height: 20px; | |
| 253 padding: 12px; | |
| 254 text-align: center; | |
| 255 } | |
| 256 | |
| 257 .action-box-remove-user-warning > * { | |
| 258 text-align: initial; | |
| 259 word-wrap: break-word; | |
| 260 } | |
| 261 | |
| 262 .total-count, | |
| 263 .pod:not(.synced) .action-box-remove-user-warning-text { | |
| 264 font-weight: 500; | |
| 203 } | 265 } |
| 204 | 266 |
| 205 .action-box-remove-user-warning .remove-warning-button { | 267 .action-box-remove-user-warning .remove-warning-button { |
| 206 height: 30px; | 268 background: var(--google-red-700); |
| 207 } | 269 min-width: 72px; |
| 208 | 270 width: auto; |
| 209 .action-box-remove-user-warning .remove-warning-button:focus { | |
| 210 /* Override the default blue border inherited from | |
| 211 button.custom-appearance:focus. */ | |
| 212 border: 1px solid transparent !important; | |
| 213 box-shadow: inset 0 0 0 1px #fff; | |
| 214 } | 271 } |
| 215 </style> | 272 </style> |
| 216 </template> | 273 </template> |
| 217 </dom-module> | 274 </dom-module> |
| OLD | NEW |