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

Side by Side 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: Reworked properties/rebase 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 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/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/promise_resolver.html"> 3 <link rel="import" href="chrome://resources/html/promise_resolver.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
5 <link rel="import" href="/about_page/about_page.html"> 5 <link rel="import" href="/about_page/about_page.html">
6 <link rel="import" href="/advanced_page/advanced_page.html"> 6 <link rel="import" href="/advanced_page/advanced_page.html">
7 <link rel="import" href="/basic_page/basic_page.html"> 7 <link rel="import" href="/basic_page/basic_page.html">
8 <link rel="import" href="/settings_main/settings_main_rendered.html"> 8 <link rel="import" href="/settings_main/settings_main_rendered.html">
9 <link rel="import" href="/settings_page/main_page_behavior.html"> 9 <link rel="import" href="/settings_page/main_page_behavior.html">
10 <link rel="import" href="/settings_root_css.html"> 10 <link rel="import" href="/settings_root_css.html">
(...skipping 22 matching lines...) Expand all
33 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ 33 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */
34 } 34 }
35 35
36 iron-icon { 36 iron-icon {
37 -webkit-margin-start: 16px; 37 -webkit-margin-start: 16px;
38 } 38 }
39 </style> 39 </style>
40 <content select="paper-icon-button"></content> 40 <content select="paper-icon-button"></content>
41 <template is="dom-if" if="[[!showAboutPage_]]"> 41 <template is="dom-if" if="[[!showAboutPage_]]">
42 <template is="dom-if" if="[[showBasicPage_]]"> 42 <template is="dom-if" if="[[showBasicPage_]]">
43 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> 43 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"
44 on-subpage-expand="subpageExpanded_"
45 on-subpage-collapsing="subpageCollapsing_">
44 </settings-basic-page> 46 </settings-basic-page>
45 </template> 47 </template>
46 <div hidden$="[[inSubpage_]]"> 48 <div hidden$="[[inSubpage_]]">
47 <div id="toggleSpacer"></div> 49 <div id="toggleSpacer"></div>
48 <div id="toggleContainer"> 50 <div id="toggleContainer">
49 <div id="advancedToggle" on-tap="toggleAdvancedPage_"> 51 <div id="advancedToggle" on-tap="toggleAdvancedPage_">
50 <span>$i18n{advancedPageTitle}</span> 52 <span>$i18n{advancedPageTitle}</span>
51 <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon> 53 <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon>
52 </div> 54 </div>
53 </div> 55 </div>
54 </div> 56 </div>
55 <template is="dom-if" if="[[showAdvancedPage_]]"> 57 <template is="dom-if" if="[[showAdvancedPage_]]">
56 <settings-advanced-page prefs="{{prefs}}" 58 <settings-advanced-page prefs="{{prefs}}"
57 current-route="{{currentRoute}}"> 59 current-route="{{currentRoute}}"
60 on-subpage-expand="subpageExpanded_"
61 on-subpage-collapsing="subpageCollapsing_">
58 </settings-advanced-page> 62 </settings-advanced-page>
59 </template> 63 </template>
60 </template> 64 </template>
61 <template is="dom-if" if="[[showAboutPage_]]"> 65 <template is="dom-if" if="[[showAboutPage_]]">
62 <settings-about-page current-route="{{currentRoute}}"> 66 <settings-about-page current-route="{{currentRoute}}">
63 </settings-about-page> 67 </settings-about-page>
64 </template> 68 </template>
65 </template> 69 </template>
66 <script src="settings_main.js"></script> 70 <script src="settings_main.js"></script>
67 <script src="/search_settings.js"></script> 71 <script src="/search_settings.js"></script>
68 </dom-module> 72 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698