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="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> | |
| 5 <link rel="import" href="/icons.html"> | 6 <link rel="import" href="/icons.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 paper-input-container { | |
| 35 -webkit-margin-start: auto; | |
| 36 width: var(--paper-input-max-width); | |
| 37 } | |
| 38 | |
| 39 input[type='search']::-webkit-search-cancel-button { | |
| 40 -webkit-appearance: none; | |
| 41 } | |
| 42 | |
| 43 #prompt, | |
| 44 #searchInput { | |
| 45 color: var(--google-grey-500); | |
| 46 font-size: 13px; | |
| 47 line-height: 36px; | |
| 48 } | |
| 49 | |
| 50 #clearSearch { | |
| 51 -webkit-margin-end: -8px; | |
| 52 -webkit-margin-start: 8px; | |
| 53 } | |
| 54 | |
| 55 :root { | |
| 56 --paper-icon-button { | |
| 57 height: 36px; | |
| 58 width: 36px; | |
| 59 } | |
| 60 | |
| 61 --paper-input-suffix: { | |
| 62 /* Required to align the icon in |clearSearch| vertically. */ | |
| 63 line-height: 0; | |
| 64 } | |
| 65 } | |
| 32 </style> | 66 </style> |
| 33 <div class="settings-box first"> | 67 <div class="settings-box first"> |
| 34 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_"> | 68 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_"> |
| 35 </paper-icon-button> | 69 </paper-icon-button> |
| 36 <h2>[[pageTitle]]</h2> | 70 <h2>[[pageTitle]]</h2> |
| 71 <paper-input-container id="searchContainer" no-label-float hidden | |
|
dpapad
2016/07/13 18:11:17
Can we re-use the existing cr-search-field instead
hcarmona
2016/07/13 23:19:40
cr-search-field doesn't match the mocks. If we can
dpapad
2016/07/13 23:32:41
cr-search-field logic is broken down to two parts
hcarmona
2016/07/20 18:59:47
Sounds good.
| |
| 72 on-search="onSearchTermSearch_"> | |
| 73 <label id="prompt">[[searchLabel]]</label> | |
| 74 <input is="iron-input" id="searchInput" type="search" | |
| 75 aria-labelledby="prompt" incremental> | |
| 76 </input> | |
| 77 <paper-icon-button suffix icon="cr:cancel" id="clearSearch" | |
| 78 on-tap="onTapClear_" title="[[clearLabel]]" | |
| 79 hidden$="[[!hasSearchTerm_(searchTerm)]]"> | |
| 80 </paper-icon-button> | |
| 81 </paper-input-container> | |
| 37 </div> | 82 </div> |
| 38 <content></content> | 83 <content></content> |
| 39 </template> | 84 </template> |
| 40 <script src="settings_subpage.js"></script> | 85 <script src="settings_subpage.js"></script> |
| 41 </dom-module> | 86 </dom-module> |
| OLD | NEW |