Chromium Code Reviews| Index: chrome/browser/resources/settings/settings_main/settings_main.html |
| diff --git a/chrome/browser/resources/settings/settings_main/settings_main.html b/chrome/browser/resources/settings/settings_main/settings_main.html |
| index 5d4c5e363ede03f9d752c2af80777a7d8b80c541..fddd36184bceb3b9231c39946c377a8ee762397d 100644 |
| --- a/chrome/browser/resources/settings/settings_main/settings_main.html |
| +++ b/chrome/browser/resources/settings/settings_main/settings_main.html |
| @@ -2,19 +2,33 @@ |
| <link rel="import" href="/about_page/about_page.html"> |
| <link rel="import" href="/advanced_page/advanced_page.html"> |
| <link rel="import" href="/basic_page/basic_page.html"> |
| +<link rel="import" href="/settings_page/main_page_behavior.html"> |
| <dom-module id="settings-main"> |
| <template> |
| <style> |
| + ::content core-icon-button { |
| + position: absolute; |
| + } |
|
Dan Beam
2016/06/02 01:28:19
"core-" are from pre-1.0 polymer, so this is dead
dschuyler
2016/06/02 23:23:54
Done.
|
| + |
| #pageContainer { |
| box-sizing: border-box; |
| - height: 100%; |
| overflow: auto; |
| padding: 0 16px; |
| } |
| - ::content core-icon-button { |
| - position: absolute; |
| + #advancedToggle { |
| + align-items: center; |
| + display: flex; |
| + min-height: 32px; |
| + padding: 0 12px; /* TODO(dschuyler): get real value. */ |
| + } |
| + |
| + #toggleContainer { |
| + align-items: center; |
| + display: flex; |
| + justify-content: center; |
| + min-height: 80px; /* TODO(dschuyler): get real value. */ |
| } |
| </style> |
| <content select="paper-icon-button"></content> |
| @@ -23,6 +37,14 @@ |
| <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> |
| </settings-basic-page> |
| </template> |
| + <template is="dom-if" if="[[showAdvancedToggle_]]"> |
| + <div id="toggleContainer"> |
| + <div id="advancedToggle" on-tap="toggleAdvancedPage_"> |
| + $i18n{advancedPageTitle} |
| + <!-- TODO(dschuyler): menu icons (up arrow/down arrow) --> |
| + </div> |
| + </div> |
| + </template> |
| <template is="dom-if" if="[[showAdvancedPage_]]"> |
| <settings-advanced-page prefs="{{prefs}}" |
| current-route="{{currentRoute}}"> |