| Index: chrome/browser/resources/md_user_manager/user_manager_styles.html
|
| diff --git a/chrome/browser/resources/md_user_manager/user_manager_styles.html b/chrome/browser/resources/md_user_manager/user_manager_styles.html
|
| index 7b0785b4975f895418a9340ea88a610d5b900faa..200aad4d83c0b5b0ad9f1543840866e8369b4017 100644
|
| --- a/chrome/browser/resources/md_user_manager/user_manager_styles.html
|
| +++ b/chrome/browser/resources/md_user_manager/user_manager_styles.html
|
| @@ -4,10 +4,10 @@
|
| <template>
|
| <style include="shared-styles">
|
| body {
|
| - background-color: #eee;
|
| + background-color: var(--paper-grey-200);
|
| }
|
|
|
| - /* Overrides for the desktop user manager screen. */
|
| + user-manager-pages,
|
| #login-header-bar {
|
| bottom: 0;
|
| left: 0;
|
| @@ -15,8 +15,24 @@
|
| right: 0;
|
| }
|
|
|
| + user-manager-pages {
|
| + top: 0;
|
| + }
|
| +
|
| + #login-header-bar.shadow {
|
| + box-shadow: 0 -1px 3px rgba(0, 0, 0, .2);
|
| + }
|
| +
|
| + /* Overrides src/ui/login/screen_container.css for the desktop user
|
| + * manager. */
|
| +
|
| #outer-container {
|
| min-height: 0;
|
| + overflow-x: hidden;
|
| + overflow-y: auto;
|
| + padding-bottom: 40px;
|
| + padding-top: 40px;
|
| + z-index: initial;
|
| }
|
|
|
| .bubble.faded {
|
| @@ -24,193 +40,235 @@
|
| }
|
|
|
| .pod {
|
| - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
|
| - height: 226px;
|
| - /* On non-retina desktop, the text is blurry if we use the scale3d()
|
| - inherited from user_pod_row.js */
|
| - transform: scale(0.9);
|
| - }
|
| -
|
| - podrow[ncolumns='6'] .pod {
|
| - transform: scale(0.8);
|
| + box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .24),
|
| + 0 0 2px 0 rgba(0, 0, 0, .12);
|
| + color: var(--paper-grey-800);
|
| + cursor: default;
|
| + height: auto;
|
| + transform: none;
|
| + width: auto;
|
| }
|
|
|
| - /* Because of crbug.com/406529, the text in the .name div is janky if there's
|
| - both a transform:scale and a transition:opacity applied to a div, so we must
|
| - apply the opacity change to the children instead. */
|
| .pod.faded {
|
| opacity: 1;
|
| }
|
|
|
| - .pod.faded .user-image-pane,
|
| - .pod.faded .main-pane {
|
| - opacity: .4;
|
| - }
|
| -
|
| - .pod.hovered:not(.focused) {
|
| - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
|
| - }
|
| -
|
| - .pod.focused {
|
| - box-shadow: 0 16px 21px rgba(0, 0, 0, 0.2);
|
| - transform: scale(1) !important;
|
| + .pod.focused,
|
| + .pod.hovered {
|
| + box-shadow: 0 10px 10px 0 rgba(0, 0, 0, .26),
|
| + 0 14px 28px 0 rgba(0, 0, 0, .25);
|
| }
|
|
|
| .pod.focused.locked {
|
| - box-shadow: 0 12px 21px rgba(0, 0, 0, 0.2);
|
| - height: 220px;
|
| + box-shadow: 0 12px 21px rgba(0, 0, 0, .2);
|
| + height: auto;
|
| }
|
|
|
| - .user-image-pane {
|
| + .pod .user-image-pane {
|
| border-top-left-radius: 2px;
|
| border-top-right-radius: 2px;
|
| - height: 180px;
|
| - left: 0;
|
| - top: 0;
|
| - width: 180px;
|
| + position: static;
|
| }
|
|
|
| - html[dir=rtl] .user-image-pane {
|
| - right: 0;
|
| + .pod .user-image {
|
| + height: 160px;
|
| + width: 160px;
|
| }
|
|
|
| - .pod .name {
|
| - margin-top: 12px;
|
| + .pod .main-pane {
|
| + line-height: 20px;
|
| + padding: 10px;
|
| + position: static;
|
| }
|
|
|
| - .pod .user-image {
|
| - height: 180px;
|
| - width: 180px;
|
| + .pod .main-pane .name-container {
|
| + display: block;
|
| + position: static;
|
| + width: auto;
|
| }
|
|
|
| - .pod input[type='password'] {
|
| - height: 45px; /* 1px shorter as to not overlap the pod's rounded corners */
|
| - top: 1px;
|
| + .pod .main-pane .name-container .name {
|
| + color: inherit;
|
| + font-size: inherit;
|
| + margin: 0;
|
| + padding: 0;
|
| + text-align: initial;
|
| + width: 118px;
|
| }
|
|
|
| .pod .indicator-container {
|
| - background-color: rgba(255, 255, 255, 0.85);
|
| - border-radius: 16px;
|
| - height: 32px;
|
| - left: 8px;
|
| + background-color: rgba(255, 255, 255, .85);
|
| + border-radius: 0;
|
| + bottom: 10px;
|
| + height: 20px;
|
| + left: auto;
|
| position: absolute;
|
| - top: 8px;
|
| + right: 10px;
|
| + top: auto;
|
| + width: 20px;
|
| }
|
|
|
| - html[dir=rtl] .pod .indicators {
|
| - left: auto;
|
| - right: 8px;
|
| + html[dir='rtl'] .pod .indicator-container {
|
| + left: 10px;
|
| + right: auto;
|
| }
|
|
|
| - .pod .indicator {
|
| + /* Using -webkit-mask on the indicators allows us to tweak the color. */
|
| + .pod .indicator-container > .indicator {
|
| + -webkit-mask-position: center;
|
| + -webkit-mask-repeat: no-repeat;
|
| + -webkit-mask-size: 20px;
|
| + background-color: var(--paper-grey-600);
|
| background-position: center;
|
| background-repeat: no-repeat;
|
| background-size: 18px;
|
| display: none;
|
| float: left;
|
| - height: 32px;
|
| - width: 32px;
|
| - }
|
| -
|
| - /* Using -webkit-mask on the indicators allows us to tweak the color. */
|
| - .pod .indicator-container > div {
|
| - -webkit-mask-position: center;
|
| - -webkit-mask-repeat: no-repeat;
|
| - -webkit-mask-size: 24px;
|
| + height: 20px;
|
| + width: 20px;
|
| }
|
|
|
| .pod.locked .locked-indicator {
|
| -webkit-mask-image: url(../../../../ui/webui/resources/images/lock.svg);
|
| - background-color: var(--paper-grey-600);
|
| display: initial;
|
| }
|
|
|
| .pod.legacy-supervised .legacy-supervised-indicator {
|
| -webkit-mask-image:
|
| url(../../../../ui/webui/resources/images/supervisor_account.svg);
|
| - background-color: var(--google-blue-500);
|
| display: initial;
|
| }
|
|
|
| .pod.child .child-indicator {
|
| -webkit-mask-image:
|
| url(../../../../ui/webui/resources/images/account_child_invert.svg);
|
| - background-color: var(--google-blue-500);
|
| display: initial;
|
| }
|
|
|
| - .main-pane {
|
| - left: 0;
|
| + .action-box-area:focus ~ .user-image-gradient-area,
|
| + .action-box-area.hovered ~ .user-image-gradient-area {
|
| + background-image: linear-gradient(rgba(0, 0, 0, .4), transparent 100%);
|
| + display: initial;
|
| + height: 56px;
|
| + position: absolute;
|
| top: 0;
|
| + width: 100%;
|
| }
|
|
|
| - html[dir=rtl] .main-pane {
|
| - right: 0;
|
| + .action-box-area {
|
| + background-color: transparent;
|
| }
|
|
|
| - .name-container,
|
| - .pod.focused:not(.multiprofiles-policy-applied) .auth-container {
|
| - top: 180px;
|
| - width: 180px;
|
| + .action-box-area.menu-moved-up {
|
| + transform: none;
|
| }
|
|
|
| - .pod.focused:not(.locked) .name-container {
|
| - display: block;
|
| + .action-box-area .action-box-button {
|
| + display: none;
|
| }
|
|
|
| - .pod .name {
|
| - color: var(--paper-grey-800);
|
| - font-size: 15px;
|
| - margin-top: 11px;
|
| + .action-box-area .action-box-icon {
|
| + color: white;
|
| + display: inline-flex;
|
| + margin-top: 4px;
|
| }
|
|
|
| .pod.focused:not(.locked) .auth-container {
|
| display: none;
|
| }
|
|
|
| - .pod[auth-type='offlinePassword'].focused.locked .password-entry-container {
|
| - display: flex;
|
| - flex: auto;
|
| + .pod.focused:not(.multiprofiles-policy-applied) .auth-container {
|
| + left: 0;
|
| }
|
|
|
| - .action-box-area {
|
| - background-color: var(--google-grey-100);
|
| - height: 24px;
|
| - /* Because of crbug.com/406529, the text in the .name div is janky if there's
|
| - an opacity transition in this div. */
|
| - transition: none;
|
| - width: 24px;
|
| + .pod .auth-container input[type='password'] {
|
| + line-height: inherit;
|
| + padding: 10px;
|
| + top: 0;
|
| + width: 140px;
|
| }
|
|
|
| - .action-box-button,
|
| - .action-box-button:hover,
|
| - .action-box-area.active .action-box-button {
|
| - background-image: none;
|
| - border-left: 6px solid transparent;
|
| - border-right: 6px solid transparent;
|
| - border-top: 6px solid #989898;
|
| - height: 0;
|
| - left: 6px;
|
| + .pod .auth-container input[type='password']:focus {
|
| + outline: 0;
|
| + }
|
| +
|
| + .pod[auth-type='onlineSignIn'] .reauth-hint-container {
|
| margin: 0;
|
| - position: absolute;
|
| - top: 9px;
|
| - width: 0;
|
| + padding: 10px 0;
|
| + }
|
| +
|
| + .reauth-hint-container .reauth-warning {
|
| + height: 20px;
|
| + width: 20px;
|
| + }
|
| +
|
| + .reauth-hint-container .reauth-name-hint {
|
| + color: inherit;
|
| + font-size: inherit;
|
| }
|
|
|
| - .action-box-button:hover,
|
| .action-box-area.active .action-box-button {
|
| - border-top: 6px solid #4c4c4c;
|
| + display: none;
|
| }
|
|
|
| - .action-box-remove-user-warning .remove-warning-button {
|
| - height: 30px;
|
| + .action-box-area.active ~ .action-box-menu:not(.menu-moved-up) {
|
| + top: 8px;
|
| + }
|
| +
|
| + .action-box-area.active ~ .action-box-menu {
|
| + border: none;
|
| + box-shadow: 0 10px 20px 0 rgba(0, 0, 0, .19);
|
| + right: 8px;
|
| + width: 224px;
|
| + }
|
| +
|
| + html[dir=rtl] .action-box-area.active ~ .action-box-menu {
|
| + left: 8px;
|
| + right: auto;
|
| + }
|
| +
|
| + .action-box-menu-title {
|
| + color: inherit;
|
| + padding: 16px 12px;
|
| + }
|
| +
|
| + .action-box-menu-title-name,
|
| + .action-box-menu-title-email {
|
| + height: auto;
|
| + }
|
| +
|
| + .action-box-menu-title-email {
|
| + color: var(--paper-grey-600);
|
| + }
|
| +
|
| + .action-box-menu-remove {
|
| + border-top: 1px solid rgba(0, 0, 0, .12);
|
| + line-height: 32px;
|
| + padding: 8px 12px;
|
| + }
|
| +
|
| + .action-box-remove-user-warning {
|
| + border-top: 1px solid rgba(0, 0, 0, .12);
|
| + font-size: inherit;
|
| + line-height: 20px;
|
| + padding: 12px;
|
| + text-align: center;
|
| }
|
|
|
| - .action-box-remove-user-warning .remove-warning-button:focus {
|
| - /* Override the default blue border inherited from
|
| - button.custom-appearance:focus. */
|
| - border: 1px solid transparent !important;
|
| - box-shadow: inset 0 0 0 1px #fff;
|
| + .action-box-remove-user-warning > * {
|
| + text-align: initial;
|
| + word-wrap: break-word;
|
| + }
|
| +
|
| + .total-count,
|
| + .pod:not(.synced) .action-box-remove-user-warning-text {
|
| + font-weight: 500;
|
| + }
|
| +
|
| + .action-box-remove-user-warning .remove-warning-button {
|
| + background: var(--google-red-700);
|
| + min-width: 72px;
|
| + width: auto;
|
| }
|
| </style>
|
| </template>
|
|
|