chrome/browser/resources/settings/settings_page/settings_animated_pages.html - Issue 1290583002: Settings: Implement sub-subpages, and clean up some animations.

Unified Diff: chrome/browser/resources/settings/settings_page/settings_animated_pages.html

Issue 1290583002: Settings: Implement sub-subpages, and clean up some animations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: simplify further. fixes display artifact. Created 5 years, 4 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

« chrome/browser/resources/settings/search_page/search_page.css ('K') | « chrome/browser/resources/settings/settings_page/settings_animated_pages.css ('k') | chrome/browser/resources/settings/settings_page/settings_animated_pages.js » ('j') | chrome/browser/resources/settings/settings_page/settings_animated_pages.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/settings_page/settings_animated_pages.html

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

index 1756933c478c03dc575893cca8cf2930a8028e17..3915e8e6289a90bb4e73283f79c8623529ace7e3 100644

--- a/chrome/browser/resources/settings/settings_page/settings_animated_pages.html

+++ b/chrome/browser/resources/settings/settings_page/settings_animated_pages.html

@@ -1,18 +1,22 @@

-<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animation-runner-behavior.html">

-<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animated-pages.html">

+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/fade-in-animation.html">

+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/fade-out-animation.html">

+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/slide-from-left-animation.html">

+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/slide-from-right-animation.html">

+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/slide-left-animation.html">

+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/slide-right-animation.html">

+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animated-pages.html">

+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animation-runner-behavior.html">

<dom-module id="cr-settings-animated-pages">

<neon-animated-pages id="animatedPages" attr-for-selected="id"

- selected="{{selectedPage}}" entry-animation="[[entryAnimation]]"

- exit-animation="[[exitAnimation]]">

+ selected="main">

</neon-animated-pages>

</template>

- <script src="settings_animations.js"></script>

</dom-module>