OLD | NEW |
---|---|
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="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
6 <link rel="import" href="/about_page/about_page.html"> | 6 <link rel="import" href="/about_page/about_page.html"> |
7 <link rel="import" href="/advanced_page/advanced_page.html"> | |
8 <link rel="import" href="/basic_page/basic_page.html"> | 7 <link rel="import" href="/basic_page/basic_page.html"> |
9 <link rel="import" href="/route.html"> | 8 <link rel="import" href="/route.html"> |
10 <link rel="import" href="/settings_page/main_page_behavior.html"> | |
11 <link rel="import" href="/settings_vars_css.html"> | 9 <link rel="import" href="/settings_vars_css.html"> |
12 | 10 |
13 <dom-module id="settings-main"> | 11 <dom-module id="settings-main"> |
14 <template> | 12 <template> |
15 <style> | 13 <style> |
16 #advancedToggle { | |
17 --paper-button: { | |
18 text-transform: none; | |
19 } | |
20 @apply(--settings-actionable); | |
21 align-items: center; | |
22 display: flex; | |
23 margin-bottom: 3px; | |
24 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ | |
25 min-height: 32px; | |
26 padding: 0 12px; | |
27 } | |
28 | |
29 #overscroll { | 14 #overscroll { |
30 margin-top: 64px; | 15 margin-top: 64px; |
31 } | 16 } |
32 | 17 |
33 #toggleContainer { | |
34 align-items: center; | |
35 display: flex; | |
36 font: inherit; | |
37 justify-content: center; | |
38 margin-bottom: 0; | |
39 margin-top: 0; | |
40 } | |
41 | |
42 #toggleSpacer { | |
43 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ | |
44 } | |
45 | |
46 iron-icon { | |
47 -webkit-margin-start: 16px; | |
48 } | |
49 | |
50 #noSearchResults { | 18 #noSearchResults { |
51 align-items: center; | 19 align-items: center; |
52 display: flex; | 20 display: flex; |
53 flex-direction: column; | 21 flex-direction: column; |
54 margin-top: 80px; | 22 margin-top: 80px; |
55 } | 23 } |
56 | 24 |
57 #noSearchResults div:first-child { | 25 #noSearchResults div:first-child { |
58 font-size: 120%; | 26 font-size: 120%; |
59 margin-bottom: 10px; | 27 margin-bottom: 10px; |
60 } | 28 } |
61 </style> | 29 </style> |
62 <content select="paper-icon-button"></content> | 30 <content select="paper-icon-button"></content> |
63 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]"> | 31 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]"> |
64 <div>$i18n{searchNoResults}</div> | 32 <div>$i18n{searchNoResults}</div> |
65 <div>$i18nRaw{searchNoResultsHelp}</div> | 33 <div>$i18nRaw{searchNoResultsHelp}</div> |
66 </div> | 34 </div> |
67 <template is="dom-if" if="[[showBasicPage_( | 35 <template is="dom-if" if="[[showPages_.settings]]"> |
68 showPages_.basic, inSearchMode_, hasExpandedSection_)]]"> | |
69 <settings-basic-page prefs="{{prefs}}" | 36 <settings-basic-page prefs="{{prefs}}" |
70 page-visibility="[[pageVisibility]]" | 37 page-visibility="[[pageVisibility]]" |
71 on-subpage-expand="onSubpageExpand_"> | 38 on-subpage-expand="onSubpageExpand_" |
39 advanced-toggle-expanded="{{advancedToggleExpanded}}" | |
dpapad
2016/11/23 20:40:04
I don't see any remaining usages of advancedToggle
michaelpg
2016/11/23 22:43:34
I wish!
advancedToggleExpanded is bound to the na
| |
40 in-search-mode="[[inSearchMode_]]"> | |
72 </settings-basic-page> | 41 </settings-basic-page> |
73 </template> | 42 </template> |
74 <template is="dom-if" | |
75 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> | |
76 <template is="dom-if" if="[[showAdvancedToggle_( | |
77 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> | |
78 <div id="toggleSpacer"></div> | |
79 <h2 id="toggleContainer"> | |
80 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}" | |
81 aria-active-attribute="aria-expanded" toggles> | |
82 <span>$i18n{advancedPageTitle}</span> | |
83 <iron-icon icon="[[arrowState_(advancedToggleExpanded)]]"> | |
84 </iron-icon> | |
85 </paper-button> | |
86 </h2> | |
87 </template> | |
88 <template is="dom-if" if="[[showAdvancedPage_( | |
89 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]"> | |
90 <settings-advanced-page prefs="{{prefs}}" | |
91 page-visibility="[[pageVisibility]]" | |
92 on-subpage-expand="onSubpageExpand_"> | |
93 </settings-advanced-page> | |
94 </template> | |
95 </template> | |
96 <template is="dom-if" if="[[showPages_.about]]"> | 43 <template is="dom-if" if="[[showPages_.about]]"> |
97 <settings-about-page></settings-about-page> | 44 <settings-about-page></settings-about-page> |
98 </template> | 45 </template> |
99 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> | 46 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> |
100 </template> | 47 </template> |
101 <script src="settings_main.js"></script> | 48 <script src="settings_main.js"></script> |
102 <script src="/search_settings.js"></script> | 49 <script src="/search_settings.js"></script> |
103 </dom-module> | 50 </dom-module> |
OLD | NEW |