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