OLD | NEW |
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/i18n_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
3 <link rel="import" href="chrome://resources/html/icon.html"> | 3 <link rel="import" href="chrome://resources/html/icon.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/html/web_ui_listener_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
10 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 10 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 } | 48 } |
49 | 49 |
50 #managed-by-domain-name { | 50 #managed-by-domain-name { |
51 font-weight: bold; | 51 font-weight: bold; |
52 } | 52 } |
53 | 53 |
54 iron-icon[icon='settings:sync'] { | 54 iron-icon[icon='settings:sync'] { |
55 --iron-icon-fill-color: var(--google-green-700); | 55 --iron-icon-fill-color: var(--google-green-700); |
56 } | 56 } |
57 | 57 |
58 iron-icon[icon='settings:sync-problem'] { | 58 #sync-status[actionable] iron-icon[icon='settings:sync-problem'] { |
59 --iron-icon-fill-color: var(--settings-error-color); | 59 --iron-icon-fill-color: var(--settings-error-color); |
60 } | 60 } |
61 | 61 |
62 .settings-box .sync-error { | 62 #sync-status:not([actionable]) .subpage-arrow { |
| 63 display: none; |
| 64 } |
| 65 |
| 66 .settings-box[actionable] .sync-error { |
63 color: var(--settings-error-color); | 67 color: var(--settings-error-color); |
64 } | 68 } |
65 | 69 |
66 .icon-container { | 70 .icon-container { |
67 display: flex; | 71 display: flex; |
68 flex-shrink: 0; | 72 flex-shrink: 0; |
69 justify-content: center; | 73 justify-content: center; |
70 width: 40px; | 74 width: 40px; |
71 } | 75 } |
72 | 76 |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 <div class="middle" | 147 <div class="middle" |
144 inner-h-t-m-l="[[getDomainHtml_(syncStatus.domain)]]"> | 148 inner-h-t-m-l="[[getDomainHtml_(syncStatus.domain)]]"> |
145 </div> | 149 </div> |
146 </div> | 150 </div> |
147 </template> | 151 </template> |
148 </if> | 152 </if> |
149 | 153 |
150 <template is="dom-if" | 154 <template is="dom-if" |
151 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 155 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
152 <div class="settings-box two-line" on-tap="onSyncTap_" | 156 <div class="settings-box two-line" on-tap="onSyncTap_" |
153 id="customize-sync" actionable$="[[!syncStatus.managed]]"> | 157 id="sync-status" actionable$="[[isSyncStatusActionable_( |
| 158 syncStatus)]]"> |
154 <div class="icon-container"> | 159 <div class="icon-container"> |
155 <iron-icon id="sync-icon" icon$="[[getSyncIcon_(syncStatus)]]"> | 160 <iron-icon id="sync-icon" icon$="[[getSyncIcon_(syncStatus)]]"> |
156 </iron-icon> | 161 </iron-icon> |
157 </div> | 162 </div> |
158 <div class="middle"> | 163 <div class="middle"> |
159 <div>$i18n{sync}</div> | 164 <div>$i18n{sync}</div> |
160 <div class="secondary" hidden="[[syncStatus.hasError]]"> | 165 <div class$="secondary [[getSyncStatusTextClass_(syncStatus)]]"> |
161 [[syncStatus.statusText]] | |
162 </div> | |
163 <div class="secondary sync-error" | |
164 hidden="[[!syncStatus.hasError]]"> | |
165 [[syncStatus.statusText]] | 166 [[syncStatus.statusText]] |
166 </div> | 167 </div> |
167 </div> | 168 </div> |
168 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 169 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
169 </div> | 170 </div> |
170 </template> | 171 </template> |
171 | 172 |
172 <div class="settings-box two-line" id="activity-controls" | 173 <div class="settings-box two-line" id="activity-controls" |
173 on-tap="onActivityControlsTap_" actionable | 174 on-tap="onActivityControlsTap_" actionable |
174 hidden="[[!syncStatus.signedIn]]"> | 175 hidden="[[!syncStatus.signedIn]]"> |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 $i18n{manageSupervisedUsersDescription} | 267 $i18n{manageSupervisedUsersDescription} |
267 </div> | 268 </div> |
268 </div> | 269 </div> |
269 <button class="icon-external" is="paper-icon-button-light"></button> | 270 <button class="icon-external" is="paper-icon-button-light"></button> |
270 </div> | 271 </div> |
271 </template> | 272 </template> |
272 </neon-animatable> | 273 </neon-animatable> |
273 <template is="dom-if" route-path="/syncSetup" | 274 <template is="dom-if" route-path="/syncSetup" |
274 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 275 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
275 <settings-subpage | 276 <settings-subpage |
276 associated-control="[[$$('#customize-sync')]]" | 277 associated-control="[[$$('#sync-status')]]" |
277 page-title="$i18n{syncPageTitle}" | 278 page-title="$i18n{syncPageTitle}" |
278 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 279 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
279 <settings-sync-page></settings-sync-page> | 280 <settings-sync-page></settings-sync-page> |
280 </settings-subpage> | 281 </settings-subpage> |
281 </template> | 282 </template> |
282 <if expr="chromeos"> | 283 <if expr="chromeos"> |
283 <template is="dom-if" if="[[quickUnlockEnabled_]]"> | 284 <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
284 <template is="dom-if" route-path="/lockScreen" no-search> | 285 <template is="dom-if" route-path="/lockScreen" no-search> |
285 <settings-subpage page-title="$i18n{lockScreenTitle}"> | 286 <settings-subpage page-title="$i18n{lockScreenTitle}"> |
286 <settings-lock-screen | 287 <settings-lock-screen |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 | 347 |
347 <if expr="chromeos"> | 348 <if expr="chromeos"> |
348 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 349 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
349 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 350 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
350 </easy-unlock-turn-off-dialog> | 351 </easy-unlock-turn-off-dialog> |
351 </template> | 352 </template> |
352 </if> | 353 </if> |
353 </template> | 354 </template> |
354 <script src="people_page.js"></script> | 355 <script src="people_page.js"></script> |
355 </dom-module> | 356 </dom-module> |
OLD | NEW |