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

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

Issue 1652553002: [MD settings] adjusting heights of settings rows; removing two .css files; unifying settings layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge with master Created 4 years, 10 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/html/i18n_behavior.html"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 3 <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/paper-button/paper-butt on.html"> 4 <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-checkbox/paper-ch eckbox.html"> 5 <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-dialog/paper-dial og.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.html">
7 <link rel="import" href="chrome://md-settings/people_page/sync_page.html"> 7 <link rel="import" href="chrome://md-settings/people_page/sync_page.html">
8 <link rel="import" href="chrome://md-settings/people_page/sync_private_api.html" > 8 <link rel="import" href="chrome://md-settings/people_page/sync_private_api.html" >
9 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 9 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
10 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> 10 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">
11 11
12 <if expr="chromeos"> 12 <if expr="chromeos">
13 <link rel="import" href="chrome://md-settings/people_page/change_picture.html"> 13 <link rel="import" href="chrome://md-settings/people_page/change_picture.html">
14 <link rel="import" href="chrome://md-settings/people_page/users_page.html"> 14 <link rel="import" href="chrome://md-settings/people_page/users_page.html">
15 </if> 15 </if>
16 <if expr="not chromeos"> 16 <if expr="not chromeos">
17 <link rel="import" href="chrome://md-settings/people_page/manage_profile.html"> 17 <link rel="import" href="chrome://md-settings/people_page/manage_profile.html">
18 </if> 18 </if>
19 19
20 <dom-module id="settings-people-page"> 20 <dom-module id="settings-people-page">
21 <link rel="import" type="css" href="chrome://md-settings/settings_shared.css"> 21 <link rel="import" type="css" href="chrome://md-settings/settings_shared.css">
22 <link rel="import" type="css" href="people_page.css"> 22 <link rel="import" type="css" href="people_page.css">
23 <template> 23 <template>
24 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 24 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
25 section="people"> 25 section="people">
26 <neon-animatable id="main"> 26 <neon-animatable id="main">
27 <div class="settings-box first"> 27 <div class="settings-box first">
28 <div class="split"> 28 <span class="start">
29 <span class="start"> 29 <img id="account-picture" src="[[profileIconUrl_]]"
30 <img id="account-picture" src="[[profileIconUrl_]]" 30 on-tap="onPictureTap_">
31 on-tap="onPictureTap_">
32 <if expr="chromeos"> 31 <if expr="chromeos">
33 <span id="profile-name" on-tap="onProfileNameTap_"> 32 <span id="profile-name" on-tap="onProfileNameTap_">
34 [[profileName_]] 33 [[profileName_]]
35 </span> 34 </span>
36 </if> 35 </if>
37 <if expr="not chromeos"> 36 <if expr="not chromeos">
38 <span id="profile-name"> 37 <span id="profile-name">
39 [[profileName_]] 38 [[profileName_]]
40 </span> 39 </span>
41 </if> 40 </if>
42 </span> 41 </span>
43 <span> 42 <span>
44 <template is="dom-if" if="[[!syncStatus.signedIn]]"> 43 <template is="dom-if" if="[[!syncStatus.signedIn]]">
45 <paper-button on-tap="onSigninTap_" raised 44 <paper-button on-tap="onSigninTap_" raised
46 disabled="[[syncStatus.setupInProgress]]"> 45 disabled="[[syncStatus.setupInProgress]]">
47 [[i18n('syncSignin')]] 46 [[i18n('syncSignin')]]
48 </paper-button> 47 </paper-button>
49 </template> 48 </template>
50 <template is="dom-if" if="[[syncStatus.signedIn]]"> 49 <template is="dom-if" if="[[syncStatus.signedIn]]">
51 <paper-button on-tap="onDisconnectTap_" 50 <paper-button on-tap="onDisconnectTap_"
52 disabled="[[syncStatus.setupInProgress]]"> 51 disabled="[[syncStatus.setupInProgress]]">
53 [[i18n('syncDisconnect')]] 52 [[i18n('syncDisconnect')]]
54 </paper-button> 53 </paper-button>
55 </template> 54 </template>
56 </span> 55 </span>
57 </div>
58 <div hidden="[[syncStatus.signedIn]]">[[i18n('syncOverview')]]</div> 56 <div hidden="[[syncStatus.signedIn]]">[[i18n('syncOverview')]]</div>
59 </div> 57 </div>
60 58
61 <div class="settings-box split" 59 <div class="settings-box"
62 hidden="[[!isStatusTextSet_(syncStatus)]]"> 60 hidden="[[!isStatusTextSet_(syncStatus)]]">
63 <span id="syncStatusText"></span> 61 <span id="syncStatusText"></span>
64 <paper-button on-tap="onActionLinkTap_"> 62 <paper-button on-tap="onActionLinkTap_">
65 [[syncStatus.actionLinkText]] 63 [[syncStatus.actionLinkText]]
66 </paper-button> 64 </paper-button>
67 </div> 65 </div>
68 66
69 <template is="dom-if" 67 <template is="dom-if"
70 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> 68 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]">
71 <div class="settings-box"> 69 <div class="settings-box">
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 <paper-button dialog-dismiss i18n-content="cancel"> 120 <paper-button dialog-dismiss i18n-content="cancel">
123 </paper-button> 121 </paper-button>
124 <paper-button dialog-confirm raised on-tap="onDisconnectConfirm_" 122 <paper-button dialog-confirm raised on-tap="onDisconnectConfirm_"
125 i18n-content="syncDisconnectConfirm"> 123 i18n-content="syncDisconnectConfirm">
126 </paper-button> 124 </paper-button>
127 </div> 125 </div>
128 </paper-dialog> 126 </paper-dialog>
129 </template> 127 </template>
130 <script src="people_page.js"></script> 128 <script src="people_page.js"></script>
131 </dom-module> 129 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698