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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/settings/people_page/change_picture.html ('k') | chrome/browser/resources/settings/privacy_page/privacy_page.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/people_page/people_page.html

diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html

index 1501caefb1120fee8a5ec9a971fe4d91343e355b..85fd5ddb00b4a3b5845412c8f6769e7679dc2776 100644

--- a/chrome/browser/resources/settings/people_page/people_page.html

+++ b/chrome/browser/resources/settings/people_page/people_page.html

@@ -25,40 +25,38 @@

section="people">

<neon-animatable id="main">

- <div class="split">

- <span class="start">

- <img id="account-picture" src="[[profileIconUrl_]]"

- on-tap="onPictureTap_">

+ <span class="start">

+ <img id="account-picture" src="[[profileIconUrl_]]"

+ on-tap="onPictureTap_">

- <span id="profile-name" on-tap="onProfileNameTap_">

- [[profileName_]]

- </span>

+ <span id="profile-name" on-tap="onProfileNameTap_">

+ [[profileName_]]

+ </span>

</if>

- <span id="profile-name">

- [[profileName_]]

- </span>

-</if>

- </span>

- <span>

- <template is="dom-if" if="[[!syncStatus.signedIn]]">

- <paper-button on-tap="onSigninTap_" raised

- disabled="[[syncStatus.setupInProgress]]">

- [[i18n('syncSignin')]]

- </paper-button>

- </template>

- <template is="dom-if" if="[[syncStatus.signedIn]]">

- <paper-button on-tap="onDisconnectTap_"

- disabled="[[syncStatus.setupInProgress]]">

- [[i18n('syncDisconnect')]]

- </paper-button>

- </template>

+ <span id="profile-name">

+ [[profileName_]]

</span>

- </div>

+</if>

+ </span>

+ <span>

+ <template is="dom-if" if="[[!syncStatus.signedIn]]">

+ <paper-button on-tap="onSigninTap_" raised

+ disabled="[[syncStatus.setupInProgress]]">

+ [[i18n('syncSignin')]]

+ </paper-button>

+ </template>

+ <template is="dom-if" if="[[syncStatus.signedIn]]">

+ <paper-button on-tap="onDisconnectTap_"

+ disabled="[[syncStatus.setupInProgress]]">

+ [[i18n('syncDisconnect')]]

+ </paper-button>

+ </template>

+ </span>

<div hidden="[[syncStatus.signedIn]]">[[i18n('syncOverview')]]</div>

</div>

- <div class="settings-box split"

+ <div class="settings-box"

hidden="[[!isStatusTextSet_(syncStatus)]]">

<paper-button on-tap="onActionLinkTap_">