OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | |
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-drawer-panel/pape r-drawer-panel.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-drawer-panel/pape r-drawer-panel.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape r-header-panel.html"> | |
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.htm l"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/typography .html"> | |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toolbar/paper-too lbar.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toolbar/paper-too lbar.html"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> |
8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
9 <link rel="import" href="chrome://md-settings/direction_delegate.html"> | 10 <link rel="import" href="chrome://md-settings/direction_delegate.html"> |
10 <link rel="import" href="chrome://md-settings/i18n_setup.html"> | 11 <link rel="import" href="chrome://md-settings/i18n_setup.html"> |
11 <link rel="import" href="chrome://md-settings/icons.html"> | 12 <link rel="import" href="chrome://md-settings/icons.html"> |
12 <link rel="import" href="chrome://md-settings/settings_main/settings_main.html"> | 13 <link rel="import" href="chrome://md-settings/settings_main/settings_main.html"> |
13 <link rel="import" href="chrome://md-settings/settings_menu/settings_menu.html"> | 14 <link rel="import" href="chrome://md-settings/settings_menu/settings_menu.html"> |
14 <link rel="import" href="chrome://md-settings/settings_page/settings_router.html "> | 15 <link rel="import" href="chrome://md-settings/settings_page/settings_router.html "> |
15 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 16 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
16 | 17 |
17 <dom-module id="settings-ui"> | 18 <dom-module id="settings-ui"> |
18 <template> | 19 <template> |
19 <style include="settings-shared"> | 20 <style include="settings-shared"> |
20 :host { | 21 :host { |
21 @apply(--layout-vertical); | 22 @apply(--layout-vertical); |
22 @apply(--layout-fit); | 23 @apply(--layout-fit); |
23 -webkit-user-select: none; | 24 -webkit-user-select: none; |
24 background-color: var(--settings-background-color); | 25 background-color: var(--settings-background-color); |
25 } | 26 } |
26 | 27 |
27 iron-icon { | 28 :root { |
tommycli
2016/04/13 20:39:29
Do these changes apply only to the paper-header-pa
dschuyler
2016/04/13 22:19:50
Done.
| |
28 --iron-icon-fill-color: var(--settings-title-bar-color); | 29 --iron-icon-fill-color: var(--settings-title-bar-color); |
29 } | 30 --paper-toolbar-height: 56px; |
30 | 31 --paper-toolbar-sm-height: 56px; |
31 paper-toolbar { | 32 --paper-toolbar-content: { |
32 @apply(--shadow-elevation-4dp); | 33 font-size: 123.08%; /* go to 16px from 13px */ |
33 --paper-toolbar-title: { | 34 } |
34 font-size: 123.08%; | 35 --paper-toolbar: { |
36 background-color: var(--settings-title-bar-background-color); | |
35 }; | 37 }; |
36 background-color: var(--settings-title-bar-background-color); | |
37 min-height: 56px; | |
38 position: relative; | |
39 z-index: 10; | |
40 } | 38 } |
41 | 39 |
42 paper-drawer-panel { | 40 paper-drawer-panel { |
43 @apply(--layout-center); | 41 @apply(--layout-center); |
44 --paper-drawer-panel-left-drawer-container: { | 42 --paper-drawer-panel-left-drawer-container: { |
45 background-color: var(--settings-background-color); | 43 background-color: var(--settings-background-color); |
46 margin-top: 8px; | |
47 }; | 44 }; |
48 --paper-drawer-panel-right-drawer-container: { | 45 --paper-drawer-panel-right-drawer-container: { |
49 background-color: var(--settings-background-color); | 46 background-color: var(--settings-background-color); |
50 margin-top: 8px; | |
51 }; | 47 }; |
52 position: relative; | 48 position: relative; |
53 } | 49 } |
54 | 50 |
55 settings-main paper-icon-button { | 51 paper-input { |
56 z-index: 10; | 52 @apply(--layout-center); |
53 --paper-input-container: { | |
54 padding-top: 0; | |
55 }; | |
56 --paper-input-container-color: var(--settings-title-search-color); | |
57 --paper-input-container-focus-color: var(--settings-title-search-color); | |
58 --paper-input-container-input: { | |
59 font-size: 81.25%; /* go to 13px from 16px */ | |
60 line-height: 16px !important; | |
Dan Beam
2016/04/13 22:51:14
don't use !important if at all possible
dschuyler
2016/04/14 21:27:22
Done.
| |
61 }; | |
62 --paper-input-container-input-color: var(--settings-title-bar-color); | |
63 --paper-input-container-label: { | |
64 font-size: 81.25%; /* go to 13px from 16px */ | |
65 }; | |
66 --paper-input-max-width: 200px; | |
67 } | |
68 | |
69 /* Prevent paper-toolbar from setting the margin-right to 24px. */ | |
70 paper-toolbar.toolbar > paper-icon-button[icon=menu][paper-drawer-toggle] { | |
71 margin-right: 0; | |
tommycli
2016/04/13 20:39:29
Are there RTL issues here?
dschuyler
2016/04/13 22:19:50
This is undoing a specific entry (margin-right) wi
tommycli
2016/04/13 22:35:28
Okay cool. I see that now. Maybe just add a TODO o
Dan Beam
2016/04/13 22:51:14
use -webkit-margin-start/end in a more specific wa
dschuyler
2016/04/14 21:27:22
Acknowledged.
dschuyler
2016/04/14 21:27:22
Done.
| |
72 } | |
73 | |
74 .heading { | |
75 margin-left: 8px; | |
tommycli
2016/04/13 20:39:29
RTL?
dschuyler
2016/04/13 22:19:50
Done.
| |
76 } | |
77 | |
78 paper-icon-button[suffix] { | |
79 --iron-icon-fill-color: var(--settings-title-search-color); | |
80 line-height: 16px !important; | |
81 height: 32px; /* After padding, the icon size is 16px. */ | |
82 width: 32px; | |
57 } | 83 } |
58 </style> | 84 </style> |
59 <settings-router current-route="{{currentRoute}}" | 85 <settings-router current-route="{{currentRoute}}" |
60 current-route-titles="{{currentRouteTitles}}"> | 86 current-route-titles="{{currentRouteTitles}}"> |
61 </settings-router> | 87 </settings-router> |
62 <paper-toolbar> | 88 <paper-drawer-panel drawer-width="256px" id="panel" |
63 <div class="title" i18n-content="settings"></div> | 89 on-paper-responsive-change="onNarrow_"> |
64 <!-- TODO(dschuyler): implement internal search. --> | 90 <paper-header-panel drawer> |
65 <iron-icon icon="md-settings-icons:search"></iron-icon> | 91 <paper-toolbar class="toolbar"> |
66 </paper-toolbar> | 92 <div class="heading flex">$i18n{settings}</div> |
67 <paper-drawer-panel drawer-width="256px" id="panel"> | 93 </paper-toolbar> |
68 <settings-menu drawer class="flex" current-route="{{currentRoute}}"> | 94 <settings-menu current-route="{{currentRoute}}"> |
69 </settings-menu> | 95 </settings-menu> |
70 <settings-main main prefs="{{prefs}}" current-route="{{currentRoute}}"> | 96 </paper-header-panel> |
71 <paper-icon-button icon="menu" paper-drawer-toggle></paper-icon-button> | 97 <paper-header-panel main> |
72 </settings-main> | 98 <paper-toolbar class="toolbar"> |
99 <paper-icon-button icon="menu" paper-drawer-toggle> | |
100 </paper-icon-button> | |
101 <div class="heading flex">[[mainTitle_]]</div> | |
102 <paper-icon-button icon="md-settings-icons:search" | |
103 on-tap="toggleSearch_"></paper-icon-button> | |
104 <template is="dom-if" if="[[showSearch_]]"> | |
105 <paper-input label="$i18n{internalSearch}" no-label-float> | |
106 <!-- TODO(dschuyler): implement internal search. --> | |
107 <paper-icon-button suffix | |
108 icon="md-settings-icons:cancel"> | |
109 </paper-icon-button> | |
110 </paper-input> | |
111 </template> | |
112 </paper-toolbar> | |
113 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> | |
114 </paper-icon-button> | |
115 </paper-header-panel> | |
73 </paper-drawer-panel> | 116 </paper-drawer-panel> |
74 </template> | 117 </template> |
75 <script src="settings_ui.js"></script> | 118 <script src="settings_ui.js"></script> |
76 </dom-module> | 119 </dom-module> |
OLD | NEW |