| 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/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <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"> |
| 5 <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"> |
| 6 <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"> |
| 7 <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"> |
| 8 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 9 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 9 <link rel="import" href="/controls/settings_checkbox.html"> | 10 <link rel="import" href="/controls/settings_checkbox.html"> |
| 10 <link rel="import" href="/people_page/sync_page.html"> | 11 <link rel="import" href="/people_page/sync_page.html"> |
| 11 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> | 12 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> |
| 12 <link rel="import" href="/people_page/sync_browser_proxy.html"> | 13 <link rel="import" href="/people_page/sync_browser_proxy.html"> |
| (...skipping 16 matching lines...) Expand all Loading... |
| 29 | 30 |
| 30 <dom-module id="settings-people-page"> | 31 <dom-module id="settings-people-page"> |
| 31 <template> | 32 <template> |
| 32 <style include="settings-shared"> | 33 <style include="settings-shared"> |
| 33 setting-box.middle { | 34 setting-box.middle { |
| 34 /* Per spec, middle text is indented 20px in this section. */ | 35 /* Per spec, middle text is indented 20px in this section. */ |
| 35 -webkit-margin-start: 20px; | 36 -webkit-margin-start: 20px; |
| 36 } | 37 } |
| 37 | 38 |
| 38 #profile-icon { | 39 #profile-icon { |
| 40 background-position: center; |
| 41 background-repeat: no-repeat; |
| 39 border-radius: 20px; | 42 border-radius: 20px; |
| 40 height: 40px; | 43 height: 40px; |
| 41 object-fit: cover; | |
| 42 vertical-align: middle; | |
| 43 width: 40px; | 44 width: 40px; |
| 44 } | 45 } |
| 45 | 46 |
| 46 #managed-by-domain-name { | 47 #managed-by-domain-name { |
| 47 font-weight: bold; | 48 font-weight: bold; |
| 48 } | 49 } |
| 49 | 50 |
| 50 iron-icon[icon='settings:sync-problem'] { | 51 iron-icon[icon='settings:sync-problem'] { |
| 51 --iron-icon-fill-color: var(--settings-error-color); | 52 --iron-icon-fill-color: var(--settings-error-color); |
| 52 } | 53 } |
| (...skipping 15 matching lines...) Expand all Loading... |
| 68 width: var(--iron-icon-width); | 69 width: var(--iron-icon-width); |
| 69 } | 70 } |
| 70 | 71 |
| 71 paper-checkbox { | 72 paper-checkbox { |
| 72 margin: 16px 0 2px; | 73 margin: 16px 0 2px; |
| 73 } | 74 } |
| 74 </style> | 75 </style> |
| 75 <settings-animated-pages id="pages" section="people"> | 76 <settings-animated-pages id="pages" section="people"> |
| 76 <neon-animatable id="main"> | 77 <neon-animatable id="main"> |
| 77 <div id="picture-subpage-trigger" class="settings-box first two-line"> | 78 <div id="picture-subpage-trigger" class="settings-box first two-line"> |
| 78 <img id="profile-icon" src="[[profileIconUrl_]]" | 79 <div id="profile-icon" on-tap="onPictureTap_" actionable |
| 79 on-tap="onPictureTap_" actionable> | 80 style="background-image: [[getIconImageset_(profileIconUrl_)]]"> |
| 81 </div> |
| 80 <div class="middle"> | 82 <div class="middle"> |
| 81 <if expr="not chromeos"> | 83 <if expr="not chromeos"> |
| 82 <span id="profile-name" on-tap="onProfileNameTap_" actionable> | 84 <span id="profile-name" on-tap="onProfileNameTap_" actionable> |
| 83 [[profileName_]] | 85 [[profileName_]] |
| 84 </span> | 86 </span> |
| 85 </if> | 87 </if> |
| 86 <if expr="chromeos"> | 88 <if expr="chromeos"> |
| 87 <span id="profile-name"> | 89 <span id="profile-name"> |
| 88 [[profileName_]] | 90 [[profileName_]] |
| 89 </span> | 91 </span> |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 | 316 |
| 315 <if expr="chromeos"> | 317 <if expr="chromeos"> |
| 316 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 318 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 317 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 319 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 318 </easy-unlock-turn-off-dialog> | 320 </easy-unlock-turn-off-dialog> |
| 319 </template> | 321 </template> |
| 320 </if> | 322 </if> |
| 321 </template> | 323 </template> |
| 322 <script src="people_page.js"></script> | 324 <script src="people_page.js"></script> |
| 323 </dom-module> | 325 </dom-module> |
| OLD | NEW |