| Index: chrome/browser/resources/settings/people_page/people_page.html
|
| diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
|
| index 2fd9a5dbb2efda232db21bf4e0a18fe6185f081e..6030e4408ce1ad8c69970e08fbae8c82374e97ee 100644
|
| --- a/chrome/browser/resources/settings/people_page/people_page.html
|
| +++ b/chrome/browser/resources/settings/people_page/people_page.html
|
| @@ -55,11 +55,15 @@
|
| --iron-icon-fill-color: var(--google-green-700);
|
| }
|
|
|
| - iron-icon[icon='settings:sync-problem'] {
|
| + #sync-status[actionable] iron-icon[icon='settings:sync-problem'] {
|
| --iron-icon-fill-color: var(--settings-error-color);
|
| }
|
|
|
| - .settings-box .sync-error {
|
| + #sync-status:not([actionable]) .subpage-arrow {
|
| + display: none;
|
| + }
|
| +
|
| + .settings-box[actionable] .sync-error {
|
| color: var(--settings-error-color);
|
| }
|
|
|
| @@ -150,18 +154,15 @@
|
| <template is="dom-if"
|
| if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]">
|
| <div class="settings-box two-line" on-tap="onSyncTap_"
|
| - id="customize-sync" actionable$="[[!syncStatus.managed]]">
|
| + id="sync-status" actionable$="[[isSyncStatusActionable_(
|
| + syncStatus)]]">
|
| <div class="icon-container">
|
| <iron-icon id="sync-icon" icon$="[[getSyncIcon_(syncStatus)]]">
|
| </iron-icon>
|
| </div>
|
| <div class="middle">
|
| <div>$i18n{sync}</div>
|
| - <div class="secondary" hidden="[[syncStatus.hasError]]">
|
| - [[syncStatus.statusText]]
|
| - </div>
|
| - <div class="secondary sync-error"
|
| - hidden="[[!syncStatus.hasError]]">
|
| + <div class$="secondary [[getSyncStatusTextClass_(syncStatus)]]">
|
| [[syncStatus.statusText]]
|
| </div>
|
| </div>
|
| @@ -273,7 +274,7 @@
|
| <template is="dom-if" route-path="/syncSetup"
|
| no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]">
|
| <settings-subpage
|
| - associated-control="[[$$('#customize-sync')]]"
|
| + associated-control="[[$$('#sync-status')]]"
|
| page-title="$i18n{syncPageTitle}"
|
| no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]">
|
| <settings-sync-page></settings-sync-page>
|
|
|