Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: chrome/browser/resources/settings/settings_main/settings_main.html

Issue 2008843003: [MD settings] redesign of side nav (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix for open advanced Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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">
6
7 <dom-module id="advanced-page-toggle">
8 <template>
9 <style include="settings-page-styles">
10 #advancedToggle {
11 @apply(--layout-center);
Dan Beam 2016/05/31 23:28:24 i don't really see the need for @apply(--layout*)
dschuyler 2016/06/02 01:05:37 Done.
12 display: flex;
13 min-height: 32px;
14 padding: 0 12px; /** TODO(dschuyler): get real value. */
Dan Beam 2016/05/31 23:28:24 /** -> /*
dschuyler 2016/06/02 01:05:37 Done.
15 }
16
17 #toggleContainer {
18 @apply(--layout-center);
19 display: flex;
20 justify-content: center;
21 min-height: 80px; /** TODO(dschuyler): get real value. */
22 }
23 </style>
24 <div id="toggleContainer">
25 <div id="advancedToggle" on-tap="toggleValue_">
26 $i18n{advancedPageTitle}
27 <!-- TODO(dschuyler): menu icons (up arrow/down arrow) -->
28 </div>
29 </div>
30 </template>
31 </dom-module>
5 32
6 <dom-module id="settings-main"> 33 <dom-module id="settings-main">
7 <template> 34 <template>
8 <style> 35 <style>
9 #pageContainer { 36 #pageContainer {
10 box-sizing: border-box; 37 box-sizing: border-box;
11 height: 100%;
12 overflow: auto; 38 overflow: auto;
13 padding: 0 16px; 39 padding: 0 16px;
14 } 40 }
15 41
16 ::content core-icon-button { 42 ::content core-icon-button {
17 position: absolute; 43 position: absolute;
18 } 44 }
19 </style> 45 </style>
20 <content select="paper-icon-button"></content> 46 <content select="paper-icon-button"></content>
21 <div id="pageContainer"> 47 <div id="pageContainer">
22 <template is="dom-if" if="[[showBasicPage_]]"> 48 <template is="dom-if" if="[[showBasicPage_]]">
23 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> 49 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}">
24 </settings-basic-page> 50 </settings-basic-page>
25 </template> 51 </template>
52 <template is="dom-if" if="[[showAdvancedToggle_]]">
53 <advanced-page-toggle></advanced-page-toggle>
54 </template>
26 <template is="dom-if" if="[[showAdvancedPage_]]"> 55 <template is="dom-if" if="[[showAdvancedPage_]]">
27 <settings-advanced-page prefs="{{prefs}}" 56 <settings-advanced-page prefs="{{prefs}}"
28 current-route="{{currentRoute}}"> 57 current-route="{{currentRoute}}">
29 </settings-advanced-page> 58 </settings-advanced-page>
30 </template> 59 </template>
31 <template is="dom-if" if="[[showAboutPage_]]"> 60 <template is="dom-if" if="[[showAboutPage_]]">
32 <settings-about-page current-route="{{currentRoute}}"> 61 <settings-about-page current-route="{{currentRoute}}">
33 </settings-about-page> 62 </settings-about-page>
34 </template> 63 </template>
35 </div> 64 </div>
36 </template> 65 </template>
37 <script src="settings_main.js"></script> 66 <script src="settings_main.js"></script>
38 </dom-module> 67 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698