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