Chromium Code Reviews| 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="/about_page/about_page.html"> | 6 <link rel="import" href="/about_page/about_page.html"> |
| 6 <link rel="import" href="/advanced_page/advanced_page.html"> | 7 <link rel="import" href="/advanced_page/advanced_page.html"> |
| 7 <link rel="import" href="/basic_page/basic_page.html"> | 8 <link rel="import" href="/basic_page/basic_page.html"> |
| 8 <link rel="import" href="/route.html"> | 9 <link rel="import" href="/route.html"> |
| 9 <link rel="import" href="/settings_page/main_page_behavior.html"> | 10 <link rel="import" href="/settings_page/main_page_behavior.html"> |
| 10 <link rel="import" href="/settings_vars_css.html"> | 11 <link rel="import" href="/settings_vars_css.html"> |
| 11 | 12 |
| 12 <dom-module id="settings-main"> | 13 <dom-module id="settings-main"> |
| 13 <template> | 14 <template> |
| 14 <style> | 15 <style> |
| 15 #advancedToggle { | 16 #advancedToggle { |
| 17 --paper-button: { | |
| 18 text-transform: none; | |
| 19 } | |
| 16 @apply(--settings-actionable); | 20 @apply(--settings-actionable); |
| 17 align-items: center; | 21 align-items: center; |
| 18 display: flex; | 22 display: flex; |
| 19 margin-bottom: 3px; | 23 margin-bottom: 3px; |
| 20 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ | 24 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ |
| 21 min-height: 32px; | 25 min-height: 32px; |
| 22 padding: 0 12px; | 26 padding: 0 12px; |
| 23 } | 27 } |
| 24 | 28 |
| 25 #overscroll { | 29 #overscroll { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 62 page-visibility="[[pageVisibility]]" | 66 page-visibility="[[pageVisibility]]" |
| 63 on-subpage-expand="onSubpageExpand_"> | 67 on-subpage-expand="onSubpageExpand_"> |
| 64 </settings-basic-page> | 68 </settings-basic-page> |
| 65 </template> | 69 </template> |
| 66 <template is="dom-if" | 70 <template is="dom-if" |
| 67 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> | 71 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> |
| 68 <template is="dom-if" if="[[showAdvancedToggle_( | 72 <template is="dom-if" if="[[showAdvancedToggle_( |
| 69 showPages_.basic, hasExpandedSection_, previousShowPages_)]]"> | 73 showPages_.basic, hasExpandedSection_, previousShowPages_)]]"> |
| 70 <div id="toggleSpacer"></div> | 74 <div id="toggleSpacer"></div> |
| 71 <div id="toggleContainer"> | 75 <div id="toggleContainer"> |
| 72 <div id="advancedToggle" on-tap="toggleAdvancedPage_"> | 76 <paper-button id="advancedToggle" on-tap="toggleAdvancedPage_"> |
|
Dan Beam
2016/09/02 21:30:55
could we just use role="button" or <button> instea
hcarmona
2016/09/02 21:55:19
Checked with bettes@ about ripple: http://crbug.co
| |
| 73 <span>$i18n{advancedPageTitle}</span> | 77 <span>$i18n{advancedPageTitle}</span> |
| 74 <iron-icon icon="[[arrowState_(showPages_.advanced)]]"></iron-icon> | 78 <iron-icon icon="[[arrowState_(showPages_.advanced)]]"></iron-icon> |
| 75 </div> | 79 </paper-button> |
| 76 </div> | 80 </div> |
| 77 </template> | 81 </template> |
| 78 <template is="dom-if" if="[[showPages_.advanced]]"> | 82 <template is="dom-if" if="[[showPages_.advanced]]"> |
| 79 <settings-advanced-page prefs="{{prefs}}" | 83 <settings-advanced-page prefs="{{prefs}}" |
| 80 page-visibility="[[pageVisibility]]" | 84 page-visibility="[[pageVisibility]]" |
| 81 on-subpage-expand="onSubpageExpand_"> | 85 on-subpage-expand="onSubpageExpand_"> |
| 82 </settings-advanced-page> | 86 </settings-advanced-page> |
| 83 </template> | 87 </template> |
| 84 </template> | 88 </template> |
| 85 <template is="dom-if" if="[[showPages_.about]]"> | 89 <template is="dom-if" if="[[showPages_.about]]"> |
| 86 <settings-about-page></settings-about-page> | 90 <settings-about-page></settings-about-page> |
| 87 </template> | 91 </template> |
| 88 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> | 92 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> |
| 89 </template> | 93 </template> |
| 90 <script src="settings_main.js"></script> | 94 <script src="settings_main.js"></script> |
| 91 <script src="/search_settings.js"></script> | 95 <script src="/search_settings.js"></script> |
| 92 </dom-module> | 96 </dom-module> |
| OLD | NEW |