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

Side by Side Diff: chrome/browser/resources/settings/settings_main/settings_main.html

Issue 2230123002: MD Settings: fix collapse animation once and for all (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Overscroll2
Patch Set: rebase, rebase fix (doWhenReady) Created 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_main/settings_main.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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="/route.html"> 8 <link rel="import" href="/route.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_vars_css.html"> 10 <link rel="import" href="/settings_vars_css.html">
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 margin-bottom: 10px; 52 margin-bottom: 10px;
53 } 53 }
54 </style> 54 </style>
55 <content select="paper-icon-button"></content> 55 <content select="paper-icon-button"></content>
56 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]"> 56 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]">
57 <div>$i18n{searchNoResults}</div> 57 <div>$i18n{searchNoResults}</div>
58 <div>$i18nRaw{searchNoResultsHelp}</div> 58 <div>$i18nRaw{searchNoResultsHelp}</div>
59 </div> 59 </div>
60 <template is="dom-if" if="[[showPages_.basic]]"> 60 <template is="dom-if" if="[[showPages_.basic]]">
61 <settings-basic-page prefs="{{prefs}}" 61 <settings-basic-page prefs="{{prefs}}"
62 page-visibility="[[pageVisibility]]"> 62 page-visibility="[[pageVisibility]]"
63 on-subpage-expand="onSubpageExpand_">
63 </settings-basic-page> 64 </settings-basic-page>
64 </template> 65 </template>
65 <template is="dom-if" 66 <template is="dom-if"
66 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> 67 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]">
67 <template is="dom-if" if="[[showAdvancedToggle_( 68 <template is="dom-if" if="[[showAdvancedToggle_(
68 showPages_.basic, inSubpage_, previousShowPages_)]]"> 69 showPages_.basic, hasExpandedSection_, previousShowPages_)]]">
69 <div id="toggleSpacer"></div> 70 <div id="toggleSpacer"></div>
70 <div id="toggleContainer"> 71 <div id="toggleContainer">
71 <div id="advancedToggle" on-tap="toggleAdvancedPage_"> 72 <div id="advancedToggle" on-tap="toggleAdvancedPage_">
72 <span>$i18n{advancedPageTitle}</span> 73 <span>$i18n{advancedPageTitle}</span>
73 <iron-icon icon="[[arrowState_(showPages_.advanced)]]"></iron-icon> 74 <iron-icon icon="[[arrowState_(showPages_.advanced)]]"></iron-icon>
74 </div> 75 </div>
75 </div> 76 </div>
76 </template> 77 </template>
77 <template is="dom-if" if="[[showPages_.advanced]]"> 78 <template is="dom-if" if="[[showPages_.advanced]]">
78 <settings-advanced-page prefs="{{prefs}}" 79 <settings-advanced-page prefs="{{prefs}}"
79 page-visibility="[[pageVisibility]]"> 80 page-visibility="[[pageVisibility]]"
81 on-subpage-expand="onSubpageExpand_">
80 </settings-advanced-page> 82 </settings-advanced-page>
81 </template> 83 </template>
82 </template> 84 </template>
83 <template is="dom-if" if="[[showPages_.about]]"> 85 <template is="dom-if" if="[[showPages_.about]]">
84 <settings-about-page></settings-about-page> 86 <settings-about-page></settings-about-page>
85 </template> 87 </template>
86 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> 88 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div>
87 </template> 89 </template>
88 <script src="settings_main.js"></script> 90 <script src="settings_main.js"></script>
89 <script src="/search_settings.js"></script> 91 <script src="/search_settings.js"></script>
90 </dom-module> 92 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_main/settings_main.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698