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

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: dpapad@ review 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/cr_elements/icons.html"> 1 <link rel="import" href="chrome://resources/cr_elements/icons.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <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/neon-animation/neon-ani matable.html">
5 <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-button/paper-butt on.html">
6 <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-checkbox/paper-ch eckbox.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.html">
8 <link rel="import" href="/controls/settings_checkbox.html"> 8 <link rel="import" href="/controls/settings_checkbox.html">
9 <link rel="import" href="/people_page/sync_page.html"> 9 <link rel="import" href="/people_page/sync_page.html">
10 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> 10 <link rel="import" href="/people_page/profile_info_browser_proxy.html">
(...skipping 27 matching lines...) Expand all
38 object-fit: cover; 38 object-fit: cover;
39 vertical-align: middle; 39 vertical-align: middle;
40 width: 40px; 40 width: 40px;
41 } 41 }
42 42
43 #profile-icon:hover, 43 #profile-icon:hover,
44 #activity-controls:hover { 44 #activity-controls:hover {
45 cursor: pointer; 45 cursor: pointer;
46 } 46 }
47 47
48 <if expr="not chromeos">
49 #profile-name:hover {
50 cursor: pointer;
51 }
52 </if>
53
54 #managed-by-domain-name { 48 #managed-by-domain-name {
55 font-weight: bold; 49 font-weight: bold;
56 } 50 }
57 51
58 iron-icon[icon="settings:sync-problem"] { 52 iron-icon[icon='settings:sync-problem'] {
59 --iron-icon-fill-color: var(--settings-error-color); 53 --iron-icon-fill-color: var(--settings-error-color);
60 } 54 }
61 55
62 .settings-box .sync-error { 56 .settings-box .sync-error {
63 color: var(--settings-error-color); 57 color: var(--settings-error-color);
64 } 58 }
65 59
66 .icon-container { 60 .icon-container {
67 display: flex; 61 display: flex;
68 justify-content: center; 62 justify-content: center;
69 width: 40px; 63 width: 40px;
70 } 64 }
71 65
72 #googleg-logo { 66 #googleg-logo {
73 background-image: url(../../../../../ui/webui/resources/images/200-logo_ googleg.png); 67 background-image: url(../../../../../ui/webui/resources/images/200-logo_ googleg.png);
74 background-size: cover; 68 background-size: cover;
75 height: var(--iron-icon-height); 69 height: var(--iron-icon-height);
76 width: var(--iron-icon-width); 70 width: var(--iron-icon-width);
77 } 71 }
78 </style> 72 </style>
79 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 73 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
80 section="people"> 74 section="people">
81 <neon-animatable id="main"> 75 <neon-animatable id="main">
82 <div class="settings-box first two-line"> 76 <div class="settings-box first two-line">
83 <img id="profile-icon" src="[[profileIconUrl_]]" 77 <img id="profile-icon" src="[[profileIconUrl_]]"
84 on-tap="onPictureTap_"> 78 on-tap="onPictureTap_" actionable>
85 <div class="middle"> 79 <div class="middle">
86 <if expr="chromeos"> 80 <if expr="not chromeos">
87 <span id="profile-name" on-tap="onProfileNameTap_"> 81 <span id="profile-name" on-tap="onProfileNameTap_" actionable>
88 [[profileName_]] 82 [[profileName_]]
89 </span> 83 </span>
90 </if> 84 </if>
91 <if expr="not chromeos"> 85 <if expr="chromeos">
92 <span id="profile-name"> 86 <span id="profile-name">
93 [[profileName_]] 87 [[profileName_]]
94 </span> 88 </span>
95 </if> 89 </if>
96 </div> 90 </div>
97 <if expr="not chromeos"> 91 <if expr="not chromeos">
98 <template is="dom-if" if="[[!syncStatus.signedIn]]"> 92 <template is="dom-if" if="[[!syncStatus.signedIn]]">
99 <span class="secondary-action"> 93 <span class="secondary-action">
100 <paper-button class="primary-button" on-tap="onSigninTap_" 94 <paper-button class="primary-button" on-tap="onSigninTap_"
101 disabled="[[syncStatus.setupInProgress]]"> 95 disabled="[[syncStatus.setupInProgress]]">
(...skipping 23 matching lines...) Expand all
125 </div> 119 </div>
126 <div class="middle" 120 <div class="middle"
127 inner-h-t-m-l="[[getDomainHtml_(syncStatus.domain)]]"> 121 inner-h-t-m-l="[[getDomainHtml_(syncStatus.domain)]]">
128 </div> 122 </div>
129 </div> 123 </div>
130 </template> 124 </template>
131 </if> 125 </if>
132 126
133 <template is="dom-if" 127 <template is="dom-if"
134 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> 128 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]">
135 <div class="settings-box two-line" on-tap="onSyncTap_"> 129 <div class="settings-box two-line" on-tap="onSyncTap_" actionable>
136 <div class="icon-container"> 130 <div class="icon-container">
137 <iron-icon id="sync-icon" icon$="[[getSyncIcon_(syncStatus)]]"> 131 <iron-icon id="sync-icon" icon$="[[getSyncIcon_(syncStatus)]]">
138 </iron-icon> 132 </iron-icon>
139 </div> 133 </div>
140 <div class="middle"> 134 <div class="middle">
141 <div>$i18n{sync}</div> 135 <div>$i18n{sync}</div>
142 <div class="secondary" hidden="[[syncStatus.hasError]]"> 136 <div class="secondary" hidden="[[syncStatus.hasError]]">
143 [[syncStatus.statusText]] 137 [[syncStatus.statusText]]
144 </div> 138 </div>
145 <div class="secondary sync-error" 139 <div class="secondary sync-error"
146 hidden="[[!syncStatus.hasError]]"> 140 hidden="[[!syncStatus.hasError]]">
147 [[syncStatus.statusText]] 141 [[syncStatus.statusText]]
148 </div> 142 </div>
149 </div> 143 </div>
150 </div> 144 </div>
151 </template> 145 </template>
152 146
153 <div class="settings-box two-line" id="activity-controls" 147 <div class="settings-box two-line" id="activity-controls"
154 on-tap="onActivityControlsTap_"> 148 on-tap="onActivityControlsTap_" actionable>
155 <div class="icon-container"> 149 <div class="icon-container">
156 <div id="googleg-logo"></div> 150 <div id="googleg-logo"></div>
157 </div> 151 </div>
158 <div class="middle"> 152 <div class="middle">
159 <div>$i18n{personalizeGoogleServicesTitle}</div> 153 <div>$i18n{personalizeGoogleServicesTitle}</div>
160 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> 154 <div class="secondary">$i18n{personalizeGoogleServicesText}</div>
161 </div> 155 </div>
162 </div> 156 </div>
163 157
164 <if expr="chromeos"> 158 <if expr="chromeos">
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 278
285 <if expr="chromeos"> 279 <if expr="chromeos">
286 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 280 <template is="dom-if" if="[[easyUnlockEnabled_]]">
287 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> 281 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
288 </easy-unlock-turn-off-dialog> 282 </easy-unlock-turn-off-dialog>
289 </template> 283 </template>
290 </if> 284 </if>
291 </template> 285 </template>
292 <script src="people_page.js"></script> 286 <script src="people_page.js"></script>
293 </dom-module> 287 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698