| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 width: var(--iron-icon-width); | 77 width: var(--iron-icon-width); |
| 78 } | 78 } |
| 79 | 79 |
| 80 paper-checkbox { | 80 paper-checkbox { |
| 81 margin: 16px 0 2px; | 81 margin: 16px 0 2px; |
| 82 } | 82 } |
| 83 </style> | 83 </style> |
| 84 <settings-animated-pages id="pages" section="people"> | 84 <settings-animated-pages id="pages" section="people"> |
| 85 <neon-animatable route-path="default"> | 85 <neon-animatable route-path="default"> |
| 86 <div id="picture-subpage-trigger" class="settings-box first two-line"> | 86 <div id="picture-subpage-trigger" class="settings-box first two-line"> |
| 87 <div id="profile-icon" on-tap="onPictureTap_" actionable | 87 <template is="dom-if" if="[[syncStatus]]"> |
| 88 style="background-image: [[getIconImageset_(profileIconUrl_)]]"> | 88 <div id="profile-icon" on-tap="onPictureTap_" actionable |
| 89 </div> | 89 style="background-image: [[getIconImageset_(profileIconUrl_)]]"> |
| 90 </div> |
| 90 <if expr="not chromeos"> | 91 <if expr="not chromeos"> |
| 91 <div class="middle two-line" on-tap="onProfileNameTap_" actionable> | 92 <div class="middle two-line" on-tap="onProfileNameTap_" actionable> |
| 92 </if> | 93 </if> |
| 93 <if expr="chromeos"> | 94 <if expr="chromeos"> |
| 94 <div class="middle two-line" on-tap="onPictureTap_" actionable> | 95 <div class="middle two-line" on-tap="onPictureTap_" actionable> |
| 95 </if> | 96 </if> |
| 96 <div class="flex"> | 97 <div class="flex"> |
| 97 <span id="profile-name">[[profileName_]]</span> | 98 <span id="profile-name">[[profileName_]]</span> |
| 98 <div class="secondary" hidden="[[!syncStatus.signedIn]]"> | 99 <div class="secondary" hidden="[[!syncStatus.signedIn]]"> |
| 99 [[syncStatus.signedInUsername]] | 100 [[syncStatus.signedInUsername]] |
| 101 </div> |
| 100 </div> | 102 </div> |
| 103 <button class="subpage-arrow" is="paper-icon-button-light"> |
| 104 </button> |
| 101 </div> | 105 </div> |
| 102 <button class="subpage-arrow" is="paper-icon-button-light"></button> | |
| 103 </div> | |
| 104 <if expr="not chromeos"> | 106 <if expr="not chromeos"> |
| 105 <template is="dom-if" if="[[showSignin_(syncStatus)]]"> | 107 <template is="dom-if" if="[[showSignin_(syncStatus)]]"> |
| 106 <span class="secondary-action"> | 108 <span class="secondary-action"> |
| 107 <paper-button class="primary-button" on-tap="onSigninTap_" | 109 <paper-button class="primary-button" on-tap="onSigninTap_" |
| 108 disabled="[[syncStatus.setupInProgress]]"> | 110 disabled="[[syncStatus.setupInProgress]]"> |
| 109 $i18n{syncSignin} | 111 $i18n{syncSignin} |
| 110 </paper-button> | 112 </paper-button> |
| 111 </span> | 113 </span> |
| 114 </template> |
| 115 <template is="dom-if" if="[[syncStatus.signedIn]]"> |
| 116 <span class="secondary-action"> |
| 117 <paper-button id="disconnectButton" class="secondary-button" |
| 118 on-tap="onDisconnectTap_" |
| 119 disabled="[[syncStatus.setupInProgress]]"> |
| 120 $i18n{syncDisconnect} |
| 121 </paper-button> |
| 122 </span> |
| 123 </template> |
| 124 </if> |
| 112 </template> | 125 </template> |
| 113 <template is="dom-if" if="[[syncStatus.signedIn]]"> | |
| 114 <span class="secondary-action"> | |
| 115 <paper-button id="disconnectButton" class="secondary-button" | |
| 116 on-tap="onDisconnectTap_" | |
| 117 disabled="[[syncStatus.setupInProgress]]"> | |
| 118 $i18n{syncDisconnect} | |
| 119 </paper-button> | |
| 120 </span> | |
| 121 </template> | |
| 122 </if> | |
| 123 </div> | 126 </div> |
| 124 <div class="settings-box two-line" | 127 <div class="settings-box two-line" |
| 125 hidden="[[!showSignin_(syncStatus)]]"> | 128 hidden="[[!showSignin_(syncStatus)]]"> |
| 126 <div> | 129 <div> |
| 127 $i18n{syncOverview} | 130 $i18n{syncOverview} |
| 128 <a target="_blank" href="$i18n{syncLearnMoreUrl}"> | 131 <a target="_blank" href="$i18n{syncLearnMoreUrl}"> |
| 129 $i18n{learnMore} | 132 $i18n{learnMore} |
| 130 </a> | 133 </a> |
| 131 </div> | 134 </div> |
| 132 </div> | 135 </div> |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 | 345 |
| 343 <if expr="chromeos"> | 346 <if expr="chromeos"> |
| 344 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 347 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 345 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 348 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 346 </easy-unlock-turn-off-dialog> | 349 </easy-unlock-turn-off-dialog> |
| 347 </template> | 350 </template> |
| 348 </if> | 351 </if> |
| 349 </template> | 352 </template> |
| 350 <script src="people_page.js"></script> | 353 <script src="people_page.js"></script> |
| 351 </dom-module> | 354 </dom-module> |
| OLD | NEW |