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-resizable-behavior
/iron-resizable-behavior.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior
/iron-resizable-behavior.html"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable-behavior.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable-behavior.html"> |
4 <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-icon-button/paper
-icon-button.html"> |
5 <link rel="import" href="/icons.html"> | 5 <link rel="import" href="/icons.html"> |
| 6 <link rel="import" href="/settings_page/settings_subpage_search.html"> |
6 <link rel="import" href="/settings_shared_css.html"> | 7 <link rel="import" href="/settings_shared_css.html"> |
7 | 8 |
8 <dom-module id="settings-subpage"> | 9 <dom-module id="settings-subpage"> |
9 <template> | 10 <template> |
10 <style include="settings-shared"> | 11 <style include="settings-shared"> |
11 :host { | 12 :host { |
12 display: block; | 13 display: block; |
13 } | 14 } |
14 | 15 |
15 .settings-box.first { | 16 .settings-box.first { |
16 padding-bottom: 16px; | 17 padding-bottom: 16px; |
17 padding-top: 8px; | 18 padding-top: 8px; |
18 } | 19 } |
19 | 20 |
20 paper-icon-button { | 21 paper-icon-button { |
21 /* The inner icon is 20px in size. paper-icon-button has 8px padding. */ | 22 /* The inner icon is 20px in size. paper-icon-button has 8px padding. */ |
22 height: 36px; | 23 height: 36px; |
23 /* Centers the ripple on the icon with appropriate margin on right. */ | 24 /* Centers the ripple on the icon with appropriate margin on right. */ |
24 margin: 0 8px 0 -8px; | 25 margin: 0 8px 0 -8px; |
25 width: 36px; | 26 width: 36px; |
26 } | 27 } |
27 | 28 |
28 h2 { | 29 h2 { |
29 color: var(--settings-nav-grey); | 30 color: var(--settings-nav-grey); |
30 font-size: 107.6923%; /* go to 14px from 13px */ | 31 font-size: 107.6923%; /* go to 14px from 13px */ |
31 } | 32 } |
| 33 |
| 34 settings-subpage-search { |
| 35 -webkit-margin-start: auto; |
| 36 } |
32 </style> | 37 </style> |
33 <div class="settings-box first"> | 38 <div class="settings-box first"> |
34 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_"> | 39 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_"> |
35 </paper-icon-button> | 40 </paper-icon-button> |
36 <h2>[[pageTitle]]</h2> | 41 <h2>[[pageTitle]]</h2> |
| 42 <template is="dom-if" if="[[searchLabel]]"> |
| 43 <settings-subpage-search label="[[searchLabel]]" |
| 44 on-search-changed="onSearchChanged_"> |
| 45 </settings-subpage-search> |
| 46 </template> |
37 </div> | 47 </div> |
38 <content></content> | 48 <content></content> |
39 </template> | 49 </template> |
40 <script src="settings_subpage.js"></script> | 50 <script src="settings_subpage.js"></script> |
41 </dom-module> | 51 </dom-module> |
OLD | NEW |