chrome/browser/resources/settings/settings_main/settings_main.html - Issue 2106013002: Move settings-section animations into setting-section, make better

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/settings_main/settings_main.html

Issue 2106013002: Move settings-section animations into setting-section, make better (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Transitions

Patch Set: Computed properties Created 4 years, 5 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/basic_page/compiled_resources2.gyp ('k') | chrome/browser/resources/settings/settings_main/settings_main.js » ('j') | chrome/browser/resources/settings/settings_main/settings_main.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2256024e3651d0c5bd9235045fc232e712688c1c..84ad784ada4ab01d5a468e6094f6f61d4824b16e 100644

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

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

@@ -38,23 +38,30 @@

}

</style>

- <template is="dom-if" if="[[showBasicPage_]]">

- <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}">

- </settings-basic-page>

- </template>

- <template is="dom-if" if="[[showAdvancedToggle_]]">

- <div id="toggleSpacer"></div>

- <div id="toggleContainer">

- <div id="advancedToggle" on-tap="toggleAdvancedPage_">

- <span>$i18n{advancedPageTitle}</span>

- <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon>

+ <template is="dom-if" if="[[!showAboutPage_]]">

+ <template is="dom-if" if="[[showBasicPage_]]">

+ <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"

+ on-subpage-expand="subpageExpanded_"

+ on-subpage-collapsing="subpageCollapsing_">

+ </settings-basic-page>

+ </template>

+ <div hidden$="[[inSubpage_]]">

+ <div id="toggleSpacer"></div>

+ <div id="toggleContainer">

+ <div id="advancedToggle" on-tap="toggleAdvancedPage_">

+ <span>$i18n{advancedPageTitle}</span>

+ <iron-icon icon="[[arrowState_(showAdvancedPage_)]]">

+ </iron-icon>

+ </div>

</div>

- </template>

- <template is="dom-if" if="[[showAdvancedPage_]]">

- <settings-advanced-page prefs="{{prefs}}"

- current-route="{{currentRoute}}">

- </settings-advanced-page>

+ <template is="dom-if" if="[[showAdvancedPage_]]">

+ <settings-advanced-page prefs="{{prefs}}"

+ current-route="{{currentRoute}}"

+ on-subpage-expand="subpageExpanded_"

+ on-subpage-collapsing="subpageCollapsing_">

+ </settings-advanced-page>

+ </template>

</template>

<settings-about-page current-route="{{currentRoute}}">