Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: chrome/browser/resources/settings/people_page/people_page.html

Issue 2393643004: [MD Settings][People] Updates positions of username and sync status message (Closed)
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 <div id="profile-icon" on-tap="onPictureTap_" actionable
88 style="background-image: [[getIconImageset_(profileIconUrl_)]]"> 88 style="background-image: [[getIconImageset_(profileIconUrl_)]]">
89 </div> 89 </div>
90 <if expr="not chromeos"> 90 <if expr="not chromeos">
91 <div class="middle two-line" on-tap="onProfileNameTap_" actionable> 91 <div class="middle two-line" on-tap="onProfileNameTap_" actionable>
92 </if> 92 </if>
93 <if expr="chromeos"> 93 <if expr="chromeos">
94 <div class="middle two-line" on-tap="onPictureTap_" actionable> 94 <div class="middle two-line" on-tap="onPictureTap_" actionable>
95 </if> 95 </if>
96 <span class="flex" id="profile-name"> 96 <div class="flex">
97 [[profileName_]] 97 <span id="profile-name">[[profileName_]]</span>
98 </span> 98 <div class="secondary" hidden="[[!syncStatus.signedIn]]">
99 [[syncStatus.signedInUsername]]
100 </div>
101 </div>
99 <button class="subpage-arrow" is="paper-icon-button-light"></button> 102 <button class="subpage-arrow" is="paper-icon-button-light"></button>
100 </div> 103 </div>
101 <if expr="not chromeos"> 104 <if expr="not chromeos">
102 <template is="dom-if" if="[[showSignin_(syncStatus)]]"> 105 <template is="dom-if" if="[[showSignin_(syncStatus)]]">
103 <span class="secondary-action"> 106 <span class="secondary-action">
104 <paper-button class="primary-button" on-tap="onSigninTap_" 107 <paper-button class="primary-button" on-tap="onSigninTap_"
105 disabled="[[syncStatus.setupInProgress]]"> 108 disabled="[[syncStatus.setupInProgress]]">
106 $i18n{syncSignin} 109 $i18n{syncSignin}
107 </paper-button> 110 </paper-button>
108 </span> 111 </span>
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 342
340 <if expr="chromeos"> 343 <if expr="chromeos">
341 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 344 <template is="dom-if" if="[[easyUnlockEnabled_]]">
342 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> 345 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
343 </easy-unlock-turn-off-dialog> 346 </easy-unlock-turn-off-dialog>
344 </template> 347 </template>
345 </if> 348 </if>
346 </template> 349 </template>
347 <script src="people_page.js"></script> 350 <script src="people_page.js"></script>
348 </dom-module> 351 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698