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

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: Refactor 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
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 margin-bottom: 10px; 49 margin-bottom: 10px;
50 } 50 }
51 </style> 51 </style>
52 <content select="paper-icon-button"></content> 52 <content select="paper-icon-button"></content>
53 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]"> 53 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]">
54 <div>$i18n{searchNoResults}</div> 54 <div>$i18n{searchNoResults}</div>
55 <div>$i18nRaw{searchNoResultsHelp}</div> 55 <div>$i18nRaw{searchNoResultsHelp}</div>
56 </div> 56 </div>
57 <template is="dom-if" if="[[showPages_.basic]]"> 57 <template is="dom-if" if="[[showPages_.basic]]">
58 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}" 58 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"
59 page-visibility="[[pageVisibility]]"> 59 page-visibility="[[pageVisibility]]"
60 on-subpage-expand="onSubpageExpand_">
60 </settings-basic-page> 61 </settings-basic-page>
61 </template> 62 </template>
62 <template is="dom-if" 63 <template is="dom-if"
63 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> 64 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]">
65
dschuyler 2016/08/04 18:36:51 I'm fine with a blank line or not having a blank l
64 <template is="dom-if" 66 <template is="dom-if"
65 if="[[showAdvancedToggle_(showPages_.basic, inSubpage_)]]"> 67 if="[[showAdvancedToggle_(showPages_.basic, hasExpandedSection_)]]">
66 <div id="toggleSpacer"></div> 68 <div id="toggleSpacer"></div>
67 <div id="toggleContainer" hidden$="[[showNoResultsFound_]]"> 69 <div id="toggleContainer" hidden$="[[showNoResultsFound_]]">
68 <div id="advancedToggle" on-tap="toggleAdvancedPage_"> 70 <div id="advancedToggle" on-tap="toggleAdvancedPage_">
69 <span>$i18n{advancedPageTitle}</span> 71 <span>$i18n{advancedPageTitle}</span>
70 <iron-icon icon="[[arrowState_(showPages_.advanced)]]"></iron-icon> 72 <iron-icon icon="[[arrowState_(showPages_.advanced)]]"></iron-icon>
71 </div> 73 </div>
72 </div> 74 </div>
73 </template> 75 </template>
74 <template is="dom-if" if="[[showPages_.advanced]]"> 76 <template is="dom-if" if="[[showPages_.advanced]]">
75 <settings-advanced-page prefs="{{prefs}}" 77 <settings-advanced-page prefs="{{prefs}}"
76 current-route="{{currentRoute}}" 78 current-route="{{currentRoute}}"
77 page-visibility="[[pageVisibility]]"> 79 page-visibility="[[pageVisibility]]"
80 on-subpage-expand="onSubpageExpand_">
78 </settings-advanced-page> 81 </settings-advanced-page>
79 </template> 82 </template>
80 </template> 83 </template>
81 <template is="dom-if" if="[[showPages_.about]]"> 84 <template is="dom-if" if="[[showPages_.about]]">
82 <settings-about-page current-route="{{currentRoute}}"> 85 <settings-about-page current-route="{{currentRoute}}">
83 </settings-about-page> 86 </settings-about-page>
84 </template> 87 </template>
85 <div id="overscroll"></div> 88 <div id="overscroll"></div>
86 </template> 89 </template>
87 <script src="settings_main.js"></script> 90 <script src="settings_main.js"></script>
88 <script src="/search_settings.js"></script> 91 <script src="/search_settings.js"></script>
89 </dom-module> 92 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698