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

Unified Diff: chrome/browser/resources/md_user_manager/import_supervised_user.html

Issue 1916913010: MD User Manager: latest design change, css refactoring, accessiblity, and bug fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md-user-manager-stylesheets
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/md_user_manager/import_supervised_user.html
diff --git a/chrome/browser/resources/md_user_manager/import_supervised_user.html b/chrome/browser/resources/md_user_manager/import_supervised_user.html
index 08817f5b1ce2366bcd3f89d3f992472a3ce2e745..101bea8df55550caee636a5b14e48a13133c269f 100644
--- a/chrome/browser/resources/md_user_manager/import_supervised_user.html
+++ b/chrome/browser/resources/md_user_manager/import_supervised_user.html
@@ -4,8 +4,10 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-selector.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.html">
<dom-module id="import-supervised-user">
<template>
@@ -28,7 +30,7 @@
box-shadow: 0 16px 24px 2px rgba(0, 0, 0, 0.14),
0 6px 30px 5px rgba(0, 0, 0, 0.12),
0 8px 10px -5px rgba(0, 0, 0, 0.4);
- color: var(--paper-grey-800);
+ color: var(--main-text-color);
width: 512px;
}
@@ -39,9 +41,11 @@
padding: 16px;
}
- #title-bar iron-icon {
- --iron-icon-height: 12px;
- --iron-icon-width: 12px;
+ #title-bar paper-icon-button {
+ --paper-icon-button: {
+ height: 36px;
+ width: 36px;
+ };
}
#message {
@@ -50,90 +54,86 @@
word-wrap: break-word;
}
- #user-list .list-item {
- align-items: center;
- display: flex;
- height: 52px;
- padding: 0 16px;
+ paper-menu {
+ --paper-menu-disabled-color: inherit;
+ --paper-menu: {
+ padding: 0;
+ color: inherit;
+ };
+ --paper-menu-focused-item: {
+ background: rgba(0, 0, 0, .04);
+ };
+ --paper-menu-selected-item: {
+ background: rgba(0, 0, 0, .04);
+ font-weight: normal;
+ };
+ --paper-menu-focused-item-after: {
+ background: none;
+ };
+ }
+
+ paper-menu paper-item {
+ --paper-item: {
+ font-size: inherit;
+ height: 52px;
+ line-height: inherit;
+ padding: 0 16px;
+ };
+ --paper-item-focused-before: {
+ background: none;
+ }
}
- #user-list .list-item .profile-img {
+ paper-menu paper-item .profile-img {
flex-shrink: 0;
}
- #user-list .list-item .profile-name {
+ paper-menu paper-item .profile-name {
-webkit-margin-start: 10px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
- #user-list .list-item .on-device {
+ paper-menu paper-item .on-device {
-webkit-margin-start: 10px;
flex-shrink: 0;
}
- #user-list .list-item.selectable.iron-selected {
- background: var(--paper-grey-200);
- }
-
#actions {
margin-top: 20px;
padding: 16px;
}
-
- #actions paper-button {
- border-radius: 2px;
- font-weight: 500;
- line-height: 36px;
- margin: 0;
- min-width: 52px;
- padding: 0 16px;
- }
-
- #actions #cancel {
- color: var(--paper-grey-600);
- }
-
- #actions #import {
- -webkit-margin-start: 8px;
- background: var(--google-blue-500);
- color: white;
- }
-
- #actions #import[disabled] {
- background: rgba(66, 133, 244, .5);
- }
</style>
<template is="dom-if" if="[[!popupHidden_]]">
<div id="backdrop">
<div id="dialog">
<div id="title-bar" class="horizontal justified layout">
- <span id="title">[[i18n('supervisedUserImportTitle')]]</span>
- <iron-icon icon="close" on-tap="onCancelTap_"></iron-icon>
+ <span id="title">$i18n{supervisedUserImportTitle}</span>
+ <paper-icon-button icon="close" on-tap="onCancelTap_">
+ </paper-icon-button>
</div>
<div id="message">[[getMessage_(supervisedUsers_)]]</div>
- <div id="user-list" class="content-area">
- <iron-selector selected="{{supervisedUserIndex_}}"
- selectable=".selectable">
- <template is="dom-repeat" items="[[supervisedUsers_]]">
- <div class$="[[getUserClassNames_(item)]]">
- <img class="profile-img" src="[[item.iconURL]]"></img>
- <div class="profile-name">[[item.name]]</div>
- <div class="on-device" hidden="[[!item.onCurrentDevice]]">
- [[i18n('supervisedUserAlreadyOnThisDevice')]]
- </div>
+ <paper-menu selected="{{supervisedUserIndex_}}">
+ <template is="dom-repeat" items="[[supervisedUsers_]]">
+ <paper-item disabled="[[item.onCurrentDevice]]">
+ <img class="profile-img" src="[[item.iconURL]]"></img>
+ <div class="profile-name">[[item.name]]</div>
+ <div class="on-device" hidden="[[!item.onCurrentDevice]]">
+ $i18n{supervisedUserAlreadyOnThisDevice}
</div>
- </template>
- </iron-selector>
- </div>
+ </paper-item>
+ </template>
+ </paper-menu>
<div id="actions" class="horizontal end-justified layout">
- <paper-button id="cancel" on-tap="onCancelTap_">
- [[i18n('cancel')]]
+ <paper-button id="cancel" class="action secondary"
+ on-tap="onCancelTap_">
+ $i18n{cancel}
</paper-button>
- <paper-button id="import" on-tap="onImportTap_"
+ <paper-button id="import" class="action primary"
+ on-tap="onImportTap_"
disabled="[[isImportDisabled_(supervisedUserIndex_)]]">
- [[i18n('supervisedUserImportOk')]]
+ $i18n{supervisedUserImportOk}
</paper-button>
</div>
</div>

Powered by Google App Engine
This is Rietveld 408576698