| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/html/icon.html"> | 5 <link rel="import" href="chrome://resources/html/icon.html"> |
| 6 <link rel="import" href="chrome://resources/html/polymer.html"> | 6 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 padding: 11px 0; | 75 padding: 11px 0; |
| 76 } | 76 } |
| 77 | 77 |
| 78 .icon-container { | 78 .icon-container { |
| 79 display: flex; | 79 display: flex; |
| 80 flex-shrink: 0; | 80 flex-shrink: 0; |
| 81 justify-content: center; | 81 justify-content: center; |
| 82 width: 40px; | 82 width: 40px; |
| 83 } | 83 } |
| 84 | 84 |
| 85 /* Avoid orphaned english text (as requested by bettes@) */ |
| 86 #activity-controls .secondary { |
| 87 max-width: 97%; |
| 88 } |
| 89 |
| 85 #googleg-logo { | 90 #googleg-logo { |
| 86 background-image: url(../../../../../ui/webui/resources/images/200-logo_
googleg.png); | 91 background-image: url(../../../../../ui/webui/resources/images/200-logo_
googleg.png); |
| 87 background-size: cover; | 92 background-size: cover; |
| 88 height: var(--iron-icon-height); | 93 height: var(--iron-icon-height); |
| 89 width: var(--iron-icon-width); | 94 width: var(--iron-icon-width); |
| 90 } | 95 } |
| 91 | 96 |
| 92 .footer .settings-box { | 97 .footer .settings-box { |
| 93 --settings-box-row-padding: 0; | 98 --settings-box-row-padding: 0; |
| 94 } | 99 } |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 <div class="middle"> | 185 <div class="middle"> |
| 181 <div>$i18n{sync}</div> | 186 <div>$i18n{sync}</div> |
| 182 <div class$="secondary [[getSyncStatusTextClass_(syncStatus)]]"> | 187 <div class$="secondary [[getSyncStatusTextClass_(syncStatus)]]"> |
| 183 [[syncStatus.statusText]] | 188 [[syncStatus.statusText]] |
| 184 </div> | 189 </div> |
| 185 </div> | 190 </div> |
| 186 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 191 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 187 </div> | 192 </div> |
| 188 </template> | 193 </template> |
| 189 | 194 |
| 190 <div class="settings-box two-line" id="activity-controls" | 195 <div class="settings-box three-line" id="activity-controls" |
| 191 on-tap="onActivityControlsTap_" actionable | 196 on-tap="onActivityControlsTap_" actionable |
| 192 hidden="[[!syncStatus.signedIn]]"> | 197 hidden="[[!syncStatus.signedIn]]"> |
| 193 <div class="icon-container"> | 198 <div class="icon-container"> |
| 194 <div id="googleg-logo"></div> | 199 <div id="googleg-logo"></div> |
| 195 </div> | 200 </div> |
| 196 <div class="middle"> | 201 <div class="middle"> |
| 197 <div>$i18n{personalizeGoogleServicesTitle}</div> | 202 <div>$i18n{personalizeGoogleServicesTitle}</div> |
| 198 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> | 203 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> |
| 199 </div> | 204 </div> |
| 200 <button class="icon-external" is="paper-icon-button-light"></button> | 205 <button class="icon-external" is="paper-icon-button-light"></button> |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 <if expr="chromeos"> | 396 <if expr="chromeos"> |
| 392 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 397 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> |
| 393 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 398 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
| 394 on-close="onEasyUnlockTurnOffDialogClose_"> | 399 on-close="onEasyUnlockTurnOffDialogClose_"> |
| 395 </easy-unlock-turn-off-dialog> | 400 </easy-unlock-turn-off-dialog> |
| 396 </template> | 401 </template> |
| 397 </if> | 402 </if> |
| 398 </template> | 403 </template> |
| 399 <script src="people_page.js"></script> | 404 <script src="people_page.js"></script> |
| 400 </dom-module> | 405 </dom-module> |
| OLD | NEW |