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

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

Issue 1642323004: User Manager MD User Pods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments. fixed a couple of issues with the existing user manager (overflowing user pod r… Created 4 years, 8 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/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: auto;
32 padding-bottom: 40px;
33 padding-top: 40px;
34 z-index: initial;
35 }
36
37 #outer-container::-webkit-scrollbar {
38 display: none;
20 } 39 }
21 40
22 .bubble.faded { 41 .bubble.faded {
23 opacity: 0; 42 opacity: 0;
24 } 43 }
25 44
26 .pod { 45 .pod {
27 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); 46 box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .24),
28 height: 226px; 47 0 0 2px 0 rgba(0, 0, 0, .12);
29 /* On non-retina desktop, the text is blurry if we use the scale3d() 48 color: var(--paper-grey-800);
30 inherited from user_pod_row.js */ 49 cursor: default;
31 transform: scale(0.9); 50 height: auto;
32 } 51 transform: none;
33 52 width: auto;
34 podrow[ncolumns='6'] .pod { 53 }
35 transform: scale(0.8); 54
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 { 55 .pod.faded {
42 opacity: 1; 56 opacity: 1;
43 } 57 }
44 58
45 .pod.faded .user-image-pane, 59 .pod.focused,
46 .pod.faded .main-pane { 60 .pod.hovered {
47 opacity: .4; 61 box-shadow: 0 10px 10px 0 rgba(0, 0, 0, .26),
48 } 62 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 } 63 }
58 64
59 .pod.focused.locked { 65 .pod.focused.locked {
60 box-shadow: 0 12px 21px rgba(0, 0, 0, 0.2); 66 box-shadow: 0 12px 21px rgba(0, 0, 0, .2);
61 height: 220px; 67 height: auto;
62 } 68 }
63 69
64 .user-image-pane { 70 .pod .user-image-pane {
65 border-top-left-radius: 2px; 71 border-top-left-radius: 2px;
66 border-top-right-radius: 2px; 72 border-top-right-radius: 2px;
67 height: 180px; 73 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 } 74 }
80 75
81 .pod .user-image { 76 .pod .user-image {
82 height: 180px; 77 height: 160px;
83 width: 180px; 78 width: 160px;
84 } 79 }
85 80
86 .pod input[type='password'] { 81 .pod .main-pane {
87 height: 45px; /* 1px shorter as to not overlap the pod's rounded corner s */ 82 line-height: 20px;
88 top: 1px; 83 padding: 10px;
84 position: static;
85 }
86
87 .pod .main-pane .name-container {
88 display: block;
89 position: static;
90 width: auto;
91 }
92
93 .pod .main-pane .name-container .name {
94 color: inherit;
95 font-size: inherit;
96 margin: 0;
97 padding: 0;
98 text-align: initial;
99 width: 118px;
89 } 100 }
90 101
91 .pod .indicator-container { 102 .pod .indicator-container {
92 background-color: rgba(255, 255, 255, 0.85); 103 background-color: rgba(255, 255, 255, .85);
93 border-radius: 16px; 104 border-radius: 0;
94 height: 32px; 105 bottom: 10px;
95 left: 8px; 106 height: 20px;
107 left: auto;
96 position: absolute; 108 position: absolute;
97 top: 8px; 109 right: 10px;
98 } 110 top: auto;
99 111 width: 20px;
100 html[dir=rtl] .pod .indicators { 112 }
101 left: auto; 113
102 right: 8px; 114 html[dir='rtl'] .pod .indicator-container {
103 } 115 left: 10px;
104 116 right: auto;
105 .pod .indicator { 117 }
118
119 /* Using -webkit-mask on the indicators allows us to tweak the color. */
120 .pod .indicator-container > .indicator {
121 -webkit-mask-position: center;
122 -webkit-mask-repeat: no-repeat;
123 -webkit-mask-size: 20px;
124 background-color: var(--paper-grey-600);
106 background-position: center; 125 background-position: center;
107 background-repeat: no-repeat; 126 background-repeat: no-repeat;
108 background-size: 18px; 127 background-size: 18px;
109 display: none; 128 display: none;
110 float: left; 129 float: left;
111 height: 32px; 130 height: 20px;
112 width: 32px; 131 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 } 132 }
121 133
122 .pod.locked .locked-indicator { 134 .pod.locked .locked-indicator {
123 -webkit-mask-image: url(../../../../ui/webui/resources/images/lock.svg); 135 -webkit-mask-image: url(../../../../ui/webui/resources/images/lock.svg);
124 background-color: var(--paper-grey-600);
125 display: initial; 136 display: initial;
126 } 137 }
127 138
128 .pod.legacy-supervised .legacy-supervised-indicator { 139 .pod.legacy-supervised .legacy-supervised-indicator {
129 -webkit-mask-image: 140 -webkit-mask-image:
130 url(../../../../ui/webui/resources/images/supervisor_account.svg); 141 url(../../../../ui/webui/resources/images/supervisor_account.svg);
131 background-color: var(--google-blue-500);
132 display: initial; 142 display: initial;
133 } 143 }
134 144
135 .pod.child .child-indicator { 145 .pod.child .child-indicator {
136 -webkit-mask-image: 146 -webkit-mask-image:
137 url(../../../../ui/webui/resources/images/account_child_invert.svg); 147 url(../../../../ui/webui/resources/images/account_child_invert.svg);
138 background-color: var(--google-blue-500); 148 display: initial;
139 display: initial; 149 }
140 } 150
141 151 .action-box-area:focus ~ .user-image-gradient-area,
142 .main-pane { 152 .action-box-area.hovered ~ .user-image-gradient-area {
153 background-image: linear-gradient(rgba(0, 0, 0, .4), transparent 100%);
154 display: initial;
155 height: 56px;
156 position: absolute;
157 top: 0;
158 width: 100%;
159 }
160
161 .action-box-area {
162 background-color: transparent;
163 }
164
165 .action-box-area.menu-moved-up {
166 -webkit-transform: none;
167 }
168
169 .action-box-area .action-box-button {
170 display: none;
171 }
172
173 .action-box-area .action-box-icon {
174 color: white;
175 display: inline-flex;
176 margin-top: 4px;
177 }
178
179 .pod.focused:not(.locked) .auth-container {
180 display: none;
181 }
182
183 .pod.focused:not(.multiprofiles-policy-applied) .auth-container {
143 left: 0; 184 left: 0;
185 }
186
187 .pod .auth-container input[type='password'] {
188 line-height: inherit;
189 padding: 10px;
144 top: 0; 190 top: 0;
145 } 191 width: 140px;
146 192 }
147 html[dir=rtl] .main-pane { 193
148 right: 0; 194 .pod .auth-container input[type='password']:focus {
149 } 195 outline: 0;
150 196 }
151 .name-container, 197
152 .pod.focused:not(.multiprofiles-policy-applied) .auth-container { 198 .pod[auth-type='onlineSignIn'] .reauth-hint-container {
153 top: 180px; 199 margin: 0;
154 width: 180px; 200 padding: 10px 0;
155 } 201 }
156 202
157 .pod.focused:not(.locked) .name-container { 203 .reauth-hint-container .reauth-warning {
158 display: block; 204 height: 20px;
159 } 205 width: 20px;
160 206 }
161 .pod .name { 207
162 color: var(--paper-grey-800); 208 .reauth-hint-container .reauth-name-hint {
163 font-size: 15px; 209 color: inherit;
164 margin-top: 11px; 210 font-size: inherit;
165 } 211 }
166 212
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 { 213 .action-box-area.active .action-box-button {
188 background-image: none; 214 display: none;
189 border-left: 6px solid transparent; 215 }
190 border-right: 6px solid transparent; 216
191 border-top: 6px solid #989898; 217 .action-box-area.active ~ .action-box-menu:not(.menu-moved-up) {
192 height: 0; 218 top: 8px;
193 left: 6px; 219 }
194 margin: 0; 220
195 position: absolute; 221 .action-box-area.active ~ .action-box-menu {
196 top: 9px; 222 border: none;
197 width: 0; 223 box-shadow: 0 10px 20px 0 rgba(0, 0, 0, .19);
198 } 224 right: 8px;
199 225 width: 224px;
200 .action-box-button:hover, 226 }
201 .action-box-area.active .action-box-button { 227
202 border-top: 6px solid #4c4c4c; 228 html[dir=rtl] .action-box-area.active ~ .action-box-menu {
229 left: 8px;
230 }
231
232 .action-box-menu-title {
233 color: inherit;
234 padding: 16px 12px;
235 }
236
237 .action-box-menu-title-name,
238 .action-box-menu-title-email {
239 height: auto;
240 }
241
242 .action-box-menu-title-email {
243 color: var(--paper-grey-600);
244 }
245
246 .action-box-menu-remove {
247 border-top: 1px solid rgba(0, 0, 0, .12);
248 line-height: 32px;
249 padding: 8px 12px;
250 }
251
252 .action-box-remove-user-warning {
253 border-top: 1px solid rgba(0, 0, 0, .12);
254 font-size: inherit;
255 line-height: 20px;
256 padding: 12px;
257 text-align: center;
258 }
259
260 .action-box-remove-user-warning > * {
261 text-align: initial;
262 word-wrap: break-word;
263 }
264
265 .pod:not(.synced) .action-box-remove-user-warning-text {
266 font-weight: bold;
Dan Beam 2016/04/19 18:00:57 bold -> 500
Moe 2016/04/19 18:41:08 Done.
203 } 267 }
204 268
205 .action-box-remove-user-warning .remove-warning-button { 269 .action-box-remove-user-warning .remove-warning-button {
206 height: 30px; 270 background: var(--google-red-700);
207 } 271 min-width: 72px;
208 272 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 } 273 }
215 </style> 274 </style>
216 </template> 275 </template>
217 </dom-module> 276 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_user_manager/user_manager.js ('k') | chrome/browser/resources/user_manager/user_manager.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698