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-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 --iron-icon-fill-color: var(--settings-nav-grey); |
| 15 display: block; | 15 display: block; |
| 16 padding-bottom: 60px; | 16 padding-bottom: 60px; |
| 17 } | 17 } |
| 18 | 18 |
| 19 .settings-box.first { | 19 .settings-box.first { |
| 20 min-height: 40px; | 20 min-height: 40px; |
| 21 padding-top: 8px; | 21 padding-top: 8px; |
| 22 } | 22 } |
| 23 | 23 |
| 24 .settings-box.first > h1 { | |
| 25 -webkit-margin-start: 4px; | |
| 26 } | |
| 27 | |
| 24 paper-icon-button { | 28 paper-icon-button { |
| 25 /* Centers the ripple on the icon with appropriate margin on right. */ | 29 /* Centers the ripple on the icon with appropriate margin on right. */ |
| 26 -webkit-margin-end: 8px; | 30 -webkit-margin-end: 8px; |
| 27 -webkit-margin-start: -8px; | 31 -webkit-margin-start: -8px; |
| 28 } | 32 } |
| 29 | 33 |
| 30 h1 { | 34 h1 { |
| 31 color: var(--settings-nav-grey); | 35 color: var(--settings-nav-grey); |
| 32 flex: 1; /* Push other items to the end. */ | 36 flex: 1; /* Push other items to the end. */ |
| 33 font-size: 107.6923%; /* Go to 14px from 13px */ | 37 font-size: 107.6923%; /* Go to 14px from 13px */ |
| 34 font-weight: 500; | 38 font-weight: 500; |
|
dschuyler
2017/01/30 22:48:12
nit: since there's only the one h1 here, would it
| |
| 35 } | 39 } |
| 36 | 40 |
| 37 settings-subpage-search { | 41 settings-subpage-search { |
| 38 -webkit-margin-start: auto; | 42 -webkit-margin-start: auto; |
| 39 } | 43 } |
| 40 </style> | 44 </style> |
| 41 <div class="settings-box first"> | 45 <div class="settings-box first"> |
| 42 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_" | 46 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_" |
| 43 aria-label="$i18n{back}"> | 47 aria-label="$i18n{back}"> |
| 44 </paper-icon-button> | 48 </paper-icon-button> |
| 45 <h1>[[pageTitle]]</h1> | 49 <h1>[[pageTitle]]</h1> |
| 46 <template is="dom-if" if="[[searchLabel]]"> | 50 <template is="dom-if" if="[[searchLabel]]"> |
| 47 <settings-subpage-search label="[[searchLabel]]" | 51 <settings-subpage-search label="[[searchLabel]]" |
| 48 on-search-changed="onSearchChanged_"> | 52 on-search-changed="onSearchChanged_"> |
| 49 </settings-subpage-search> | 53 </settings-subpage-search> |
| 50 </template> | 54 </template> |
| 51 <content select=".subpage-title-extra"></content> | 55 <content select=".subpage-title-extra"></content> |
| 52 </div> | 56 </div> |
| 53 <content></content> | 57 <content></content> |
| 54 </template> | 58 </template> |
| 55 <script src="settings_subpage.js"></script> | 59 <script src="settings_subpage.js"></script> |
| 56 </dom-module> | 60 </dom-module> |
| OLD | NEW |