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

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

Issue 2094813002: MD Settings: make custom UIs look "actionable" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.html">
7 <link rel="import" href="/controls/settings_checkbox.html"> 7 <link rel="import" href="/controls/settings_checkbox.html">
8 <link rel="import" href="/people_page/sync_page.html"> 8 <link rel="import" href="/people_page/sync_page.html">
9 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> 9 <link rel="import" href="/people_page/profile_info_browser_proxy.html">
10 <link rel="import" href="/people_page/sync_browser_proxy.html"> 10 <link rel="import" href="/people_page/sync_browser_proxy.html">
(...skipping 26 matching lines...) Expand all
37 object-fit: cover; 37 object-fit: cover;
38 vertical-align: middle; 38 vertical-align: middle;
39 width: 40px; 39 width: 40px;
40 } 40 }
41 41
42 #profile-icon:hover, 42 #profile-icon:hover,
43 #activity-controls:hover { 43 #activity-controls:hover {
44 cursor: pointer; 44 cursor: pointer;
45 } 45 }
46 46
47 <if expr="not chromeos">
48 #profile-name:hover {
49 cursor: pointer;
50 }
51 </if>
Dan Beam 2016/06/23 19:20:01 redundant
52
53 #sync-icon { 47 #sync-icon {
54 margin: 0 10px; 48 margin: 0 10px;
55 } 49 }
56 50
57 iron-icon[icon="settings:sync-problem"] { 51 iron-icon[icon='settings:sync-problem'] {
Dan Beam 2016/06/23 19:20:01 presubmit
58 --iron-icon-fill-color: var(--settings-error-color); 52 --iron-icon-fill-color: var(--settings-error-color);
59 } 53 }
60 54
61 .settings-box .sync-error { 55 .settings-box .sync-error {
62 color: var(--settings-error-color); 56 color: var(--settings-error-color);
63 } 57 }
64 58
65 #googleg-logo-container { 59 #googleg-logo-container {
66 display: flex; 60 display: flex;
67 justify-content: center; 61 justify-content: center;
68 width: 40px; 62 width: 40px;
69 } 63 }
70 64
71 #googleg-logo { 65 #googleg-logo {
72 background-image: url(../../../../../ui/webui/resources/images/200-logo_ googleg.png); 66 background-image: url(../../../../../ui/webui/resources/images/200-logo_ googleg.png);
73 background-size: cover; 67 background-size: cover;
74 height: var(--iron-icon-height); 68 height: var(--iron-icon-height);
75 width: var(--iron-icon-width); 69 width: var(--iron-icon-width);
76 } 70 }
77 </style> 71 </style>
78 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 72 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
79 section="people"> 73 section="people">
80 <neon-animatable id="main"> 74 <neon-animatable id="main">
81 <div class="settings-box first two-line"> 75 <div class="settings-box first two-line">
82 <img id="profile-icon" src="[[profileIconUrl_]]" 76 <img id="profile-icon" src="[[profileIconUrl_]]"
83 on-tap="onPictureTap_"> 77 on-tap="onPictureTap_" actionable>
84 <div class="middle"> 78 <div class="middle">
85 <if expr="chromeos"> 79 <if expr="not chromeos">
86 <span id="profile-name" on-tap="onProfileNameTap_"> 80 <span id="profile-name" on-tap="onProfileNameTap_" actionable>
87 [[profileName_]] 81 [[profileName_]]
88 </span> 82 </span>
89 </if> 83 </if>
90 <if expr="not chromeos"> 84 <if expr="chromeos">
Dan Beam 2016/06/23 19:20:00 talked with tommycli@: this was reversed (as I sus
91 <span id="profile-name"> 85 <span id="profile-name">
92 [[profileName_]] 86 [[profileName_]]
93 </span> 87 </span>
94 </if> 88 </if>
95 </div> 89 </div>
96 <if expr="not chromeos"> 90 <if expr="not chromeos">
97 <template is="dom-if" if="[[!syncStatus.signedIn]]"> 91 <template is="dom-if" if="[[!syncStatus.signedIn]]">
98 <span class="secondary-action"> 92 <span class="secondary-action">
99 <paper-button class="primary-button" on-tap="onSigninTap_" 93 <paper-button class="primary-button" on-tap="onSigninTap_"
100 disabled="[[syncStatus.setupInProgress]]"> 94 disabled="[[syncStatus.setupInProgress]]">
(...skipping 10 matching lines...) Expand all
111 </span> 105 </span>
112 </template> 106 </template>
113 </if> 107 </if>
114 </div> 108 </div>
115 <div class="settings-box two-line" hidden="[[syncStatus.signedIn]]"> 109 <div class="settings-box two-line" hidden="[[syncStatus.signedIn]]">
116 $i18n{syncOverview} 110 $i18n{syncOverview}
117 </div> 111 </div>
118 112
119 <template is="dom-if" 113 <template is="dom-if"
120 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> 114 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]">
121 <div class="settings-box two-line" on-tap="onSyncTap_"> 115 <div class="settings-box two-line" on-tap="onSyncTap_" actionable>
122 <iron-icon id="sync-icon" icon$="[[getSyncIcon_(syncStatus)]]"> 116 <iron-icon id="sync-icon" icon$="[[getSyncIcon_(syncStatus)]]">
123 </iron-icon> 117 </iron-icon>
124 <div class="middle"> 118 <div class="middle">
125 <div>$i18n{sync}</div> 119 <div>$i18n{sync}</div>
126 <div class="secondary" hidden="[[syncStatus.hasError]]"> 120 <div class="secondary" hidden="[[syncStatus.hasError]]">
127 [[syncStatus.statusText]] 121 [[syncStatus.statusText]]
128 </div> 122 </div>
129 <div class="secondary sync-error" 123 <div class="secondary sync-error"
130 hidden="[[!syncStatus.hasError]]"> 124 hidden="[[!syncStatus.hasError]]">
131 [[syncStatus.statusText]] 125 [[syncStatus.statusText]]
132 </div> 126 </div>
133 </div> 127 </div>
134 </div> 128 </div>
135 </template> 129 </template>
136 130
137 <div class="settings-box two-line" id="activity-controls" 131 <div class="settings-box two-line" id="activity-controls"
138 on-tap="onActivityControlsTap_"> 132 on-tap="onActivityControlsTap_" actionable>
139 <div id="googleg-logo-container"> 133 <div id="googleg-logo-container">
140 <div id="googleg-logo"></div> 134 <div id="googleg-logo"></div>
141 </div> 135 </div>
142 <div class="middle"> 136 <div class="middle">
143 <div>$i18n{personalizeGoogleServicesTitle}</div> 137 <div>$i18n{personalizeGoogleServicesTitle}</div>
144 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> 138 <div class="secondary">$i18n{personalizeGoogleServicesText}</div>
145 </div> 139 </div>
146 </div> 140 </div>
147 141
148 <if expr="chromeos"> 142 <if expr="chromeos">
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 262
269 <if expr="chromeos"> 263 <if expr="chromeos">
270 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 264 <template is="dom-if" if="[[easyUnlockEnabled_]]">
271 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> 265 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
272 </easy-unlock-turn-off-dialog> 266 </easy-unlock-turn-off-dialog>
273 </template> 267 </template>
274 </if> 268 </if>
275 </template> 269 </template>
276 <script src="people_page.js"></script> 270 <script src="people_page.js"></script>
277 </dom-module> 271 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698