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

Side by Side Diff: chrome/browser/resources/settings/people_page/user_list.html

Issue 2848973003: MD Settings: convert paper-icon-button to paper-icon-button-light. (Closed)
Patch Set: add missing files Created 3 years, 7 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://resources/cr_elements/cr_scrollable_behavior.h tml"> 1 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml">
2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 2 <link rel="import" href="chrome://resources/cr_elements/icons.html">
3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
4 <link rel="import" href="chrome://resources/html/polymer.html"> 4 <link rel="import" href="chrome://resources/html/polymer.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
7 <link rel="import" href="../route.html"> 7 <link rel="import" href="../route.html">
8 <link rel="import" href="../settings_shared_css.html"> 8 <link rel="import" href="../settings_shared_css.html">
9 9
10 <dom-module id="settings-user-list"> 10 <dom-module id="settings-user-list">
11 <template> 11 <template>
12 <style include="settings-shared iron-flex"> 12 <style include="settings-shared iron-flex">
13 .user-list { 13 .user-list {
14 /* 4 users (the extra 1px is to account for the border-bottom) */ 14 /* 4 users (the extra 1px is to account for the border-bottom) */
15 max-height: calc(4 * (var(--settings-row-two-line-min-height) + 1px)); 15 max-height: calc(4 * (var(--settings-row-two-line-min-height) + 1px));
16 overflow-y: auto; 16 overflow-y: auto;
17 } 17 }
18 18
19 .user { 19 .user {
20 border-bottom: var(--settings-separator-line); 20 border-bottom: var(--settings-separator-line);
21 } 21 }
22 22
23 .user-icon { 23 .user-icon {
24 background-position: center; 24 background-position: center;
25 background-repeat: no-repeat; 25 background-repeat: no-repeat;
26 background-size: cover; 26 background-size: cover;
27 border-radius: 20px; 27 border-radius: 20px;
28 flex-shrink: 0; 28 flex-shrink: 0;
29 height: 40px; 29 height: 40px;
30 width: 40px; 30 width: 40px;
31 } 31 }
32 32
33 .user-info { 33 .user-info {
34 -webkit-padding-start: 20px; 34 -webkit-padding-start: 20px;
35 } 35 }
36
37 [scrollable] .icon-clear {
38 background-color: transparent;
39 }
stevenjb 2017/05/23 22:16:02 I'd still prefer to make this change globally and
stevenjb 2017/05/23 23:19:24 I just re-read my first suggestion and actually li
scottchen 2017/05/27 00:18:03 Cool, I'll remove it here.
36 </style> 40 </style>
37 <div class="user-list" scrollable> 41 <div class="user-list" scrollable>
38 <template is="dom-repeat" items="[[users_]]"> 42 <template is="dom-repeat" items="[[users_]]">
39 <div class="user layout horizontal center two-line"> 43 <div class="user layout horizontal center two-line">
40 <img class="user-icon" src="[[getProfilePictureUrl_(item)]]"> 44 <img class="user-icon" src="[[getProfilePictureUrl_(item)]]">
41 <div class="flex user-info"> 45 <div class="flex user-info">
42 <div>[[getUserName_(item)]]</div> 46 <div>[[getUserName_(item)]]</div>
43 <template is="dom-if" if="[[shouldShowEmail_(item)]]"> 47 <template is="dom-if" if="[[shouldShowEmail_(item)]]">
44 <div class="secondary">[[item.email]]</div> 48 <div class="secondary">[[item.email]]</div>
45 </template> 49 </template>
46 </div> 50 </div>
47 <paper-icon-button icon="cr:clear" class="clear-icon" 51 <button is="paper-icon-button-light" class="icon-clear"
48 on-tap="removeUser_" 52 on-tap="removeUser_"
49 hidden="[[shouldHideCloseButton_(disabled, item.isOwner)]]"> 53 hidden="[[shouldHideCloseButton_(disabled, item.isOwner)]]">
50 </paper-icon-button> 54 </button>
51 </div> 55 </div>
52 </template> 56 </template>
53 </div> 57 </div>
54 </template> 58 </template>
55 <script src="user_list.js"></script> 59 <script src="user_list.js"></script>
56 </dom-module> 60 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698