Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="/about_page/about_page.html"> | 2 <link rel="import" href="/about_page/about_page.html"> |
| 3 <link rel="import" href="/advanced_page/advanced_page.html"> | 3 <link rel="import" href="/advanced_page/advanced_page.html"> |
| 4 <link rel="import" href="/basic_page/basic_page.html"> | 4 <link rel="import" href="/basic_page/basic_page.html"> |
| 5 <link rel="import" href="/settings_page/main_page_behavior.html"> | |
| 5 | 6 |
| 6 <dom-module id="settings-main"> | 7 <dom-module id="settings-main"> |
| 7 <template> | 8 <template> |
| 8 <style> | 9 <style> |
| 10 ::content core-icon-button { | |
| 11 position: absolute; | |
| 12 } | |
|
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.
| |
| 13 | |
| 9 #pageContainer { | 14 #pageContainer { |
| 10 box-sizing: border-box; | 15 box-sizing: border-box; |
| 11 height: 100%; | |
| 12 overflow: auto; | 16 overflow: auto; |
| 13 padding: 0 16px; | 17 padding: 0 16px; |
| 14 } | 18 } |
| 15 | 19 |
| 16 ::content core-icon-button { | 20 #advancedToggle { |
| 17 position: absolute; | 21 align-items: center; |
| 22 display: flex; | |
| 23 min-height: 32px; | |
| 24 padding: 0 12px; /* TODO(dschuyler): get real value. */ | |
| 25 } | |
| 26 | |
| 27 #toggleContainer { | |
| 28 align-items: center; | |
| 29 display: flex; | |
| 30 justify-content: center; | |
| 31 min-height: 80px; /* TODO(dschuyler): get real value. */ | |
| 18 } | 32 } |
| 19 </style> | 33 </style> |
| 20 <content select="paper-icon-button"></content> | 34 <content select="paper-icon-button"></content> |
| 21 <div id="pageContainer"> | 35 <div id="pageContainer"> |
| 22 <template is="dom-if" if="[[showBasicPage_]]"> | 36 <template is="dom-if" if="[[showBasicPage_]]"> |
| 23 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> | 37 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> |
| 24 </settings-basic-page> | 38 </settings-basic-page> |
| 25 </template> | 39 </template> |
| 40 <template is="dom-if" if="[[showAdvancedToggle_]]"> | |
| 41 <div id="toggleContainer"> | |
| 42 <div id="advancedToggle" on-tap="toggleAdvancedPage_"> | |
| 43 $i18n{advancedPageTitle} | |
| 44 <!-- TODO(dschuyler): menu icons (up arrow/down arrow) --> | |
| 45 </div> | |
| 46 </div> | |
| 47 </template> | |
| 26 <template is="dom-if" if="[[showAdvancedPage_]]"> | 48 <template is="dom-if" if="[[showAdvancedPage_]]"> |
| 27 <settings-advanced-page prefs="{{prefs}}" | 49 <settings-advanced-page prefs="{{prefs}}" |
| 28 current-route="{{currentRoute}}"> | 50 current-route="{{currentRoute}}"> |
| 29 </settings-advanced-page> | 51 </settings-advanced-page> |
| 30 </template> | 52 </template> |
| 31 <template is="dom-if" if="[[showAboutPage_]]"> | 53 <template is="dom-if" if="[[showAboutPage_]]"> |
| 32 <settings-about-page current-route="{{currentRoute}}"> | 54 <settings-about-page current-route="{{currentRoute}}"> |
| 33 </settings-about-page> | 55 </settings-about-page> |
| 34 </template> | 56 </template> |
| 35 </div> | 57 </div> |
| 36 </template> | 58 </template> |
| 37 <script src="settings_main.js"></script> | 59 <script src="settings_main.js"></script> |
| 38 </dom-module> | 60 </dom-module> |
| OLD | NEW |