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

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

Issue 2160713002: MD Settings: refactor some main page properties, fix Advanced toggle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: object 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
« 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="/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 20 matching lines...) Expand all
31 31
32 #toggleSpacer { 32 #toggleSpacer {
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="[[showBasicPage_]]"> 41 <template is="dom-if" if="[[!showPages_.ABOUT]]">
dschuyler 2016/07/21 02:38:22 Why is about all caps, as if it were a const?
michaelpg 2016/07/21 03:00:28 Hmm, I guess it's not a const (since yeah, it's a
42 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> 42 <template is="dom-if" if="[[showPages_.BASIC]]">
43 </settings-basic-page> 43 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}">
44 </template> 44 </settings-basic-page>
45 <template is="dom-if" if="[[showAdvancedToggle_]]"> 45 </template>
46 <div id="toggleSpacer"></div> 46 <div hidden$="[[inSubpage_]]">
47 <div id="toggleContainer"> 47 <div id="toggleSpacer"></div>
48 <div id="advancedToggle" on-tap="toggleAdvancedPage_"> 48 <div id="toggleContainer">
49 <span>$i18n{advancedPageTitle}</span> 49 <div id="advancedToggle" on-tap="toggleAdvancedPage_">
50 <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon> 50 <span>$i18n{advancedPageTitle}</span>
51 <iron-icon icon="[[arrowState_(showPages_.ADVANCED)]]"></iron-icon>
52 </div>
51 </div> 53 </div>
52 </div> 54 </div>
55 <template is="dom-if" if="[[showPages_.ADVANCED]]">
56 <settings-advanced-page prefs="{{prefs}}"
57 current-route="{{currentRoute}}">
58 </settings-advanced-page>
59 </template>
53 </template> 60 </template>
54 <template is="dom-if" if="[[showAdvancedPage_]]"> 61 <template is="dom-if" if="[[showPages_.ABOUT]]">
55 <settings-advanced-page prefs="{{prefs}}"
56 current-route="{{currentRoute}}">
57 </settings-advanced-page>
58 </template>
59 <template is="dom-if" if="[[showAboutPage_]]">
60 <settings-about-page current-route="{{currentRoute}}"> 62 <settings-about-page current-route="{{currentRoute}}">
61 </settings-about-page> 63 </settings-about-page>
62 </template> 64 </template>
63 </template> 65 </template>
64 <script src="settings_main.js"></script> 66 <script src="settings_main.js"></script>
65 <script src="/search_settings.js"></script> 67 <script src="/search_settings.js"></script>
66 </dom-module> 68 </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