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

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: cleanup 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/polymer/v1_0/iron-icon/iron-icon.htm l"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
4 <link rel="import" href="/about_page/about_page.html"> 4 <link rel="import" href="/about_page/about_page.html">
5 <link rel="import" href="/advanced_page/advanced_page.html"> 5 <link rel="import" href="/advanced_page/advanced_page.html">
6 <link rel="import" href="/basic_page/basic_page.html"> 6 <link rel="import" href="/basic_page/basic_page.html">
7 <link rel="import" href="/settings_page/main_page_behavior.html"> 7 <link rel="import" href="/settings_page/main_page_behavior.html">
8 <link rel="import" href="/settings_root_css.html"> 8 <link rel="import" href="/settings_root_css.html">
9 9
10 <dom-module id="settings-main"> 10 <dom-module id="settings-main">
(...skipping 19 matching lines...) Expand all
30 #toggleSpacer { 30 #toggleSpacer {
31 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ 31 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */
32 } 32 }
33 33
34 iron-icon { 34 iron-icon {
35 -webkit-margin-start: 16px; 35 -webkit-margin-start: 16px;
36 } 36 }
37 </style> 37 </style>
38 <content select="paper-icon-button"></content> 38 <content select="paper-icon-button"></content>
39 <template is="dom-if" if="[[showBasicPage_]]"> 39 <template is="dom-if" if="[[showBasicPage_]]">
40 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> 40 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"
41 on-subpage-expand="subpageExpanded_"
michaelpg 2016/06/28 23:45:16 dschuyler, please take a look at these changes. We
42 on-subpage-collapsing="subpageCollapsing_">
41 </settings-basic-page> 43 </settings-basic-page>
42 </template> 44 </template>
43 <template is="dom-if" if="[[showAdvancedToggle_]]"> 45 <template is="dom-if" if="[[showAdvancedToggle_]]">
44 <div id="toggleSpacer"></div> 46 <div id="toggleSpacer"></div>
45 <div id="toggleContainer"> 47 <div id="toggleContainer">
46 <div id="advancedToggle" on-tap="toggleAdvancedPage_"> 48 <div id="advancedToggle" on-tap="toggleAdvancedPage_">
47 <span>$i18n{advancedPageTitle}</span> 49 <span>$i18n{advancedPageTitle}</span>
48 <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon> 50 <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon>
49 </div> 51 </div>
50 </div> 52 </div>
51 </template> 53 </template>
52 <template is="dom-if" if="[[showAdvancedPage_]]"> 54 <template is="dom-if" if="[[showAdvancedPage_]]">
53 <settings-advanced-page prefs="{{prefs}}" 55 <settings-advanced-page prefs="{{prefs}}"
54 current-route="{{currentRoute}}"> 56 current-route="{{currentRoute}}"
57 on-subpage-expand="subpageExpanded_"
58 on-subpage-collapsing="subpageCollapsing_">
55 </settings-advanced-page> 59 </settings-advanced-page>
56 </template> 60 </template>
57 <template is="dom-if" if="[[showAboutPage_]]"> 61 <template is="dom-if" if="[[showAboutPage_]]">
58 <settings-about-page current-route="{{currentRoute}}"> 62 <settings-about-page current-route="{{currentRoute}}">
59 </settings-about-page> 63 </settings-about-page>
60 </template> 64 </template>
61 </template> 65 </template>
62 <script src="settings_main.js"></script> 66 <script src="settings_main.js"></script>
63 </dom-module> 67 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698