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