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-flex-layout/iron-f lex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.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-spinner/paper-spi nner.html"> | |
| 5 <link rel="import" href="chrome://resources/cr_elements/cr_search_field/cr_searc h_field.html"> | 6 <link rel="import" href="chrome://resources/cr_elements/cr_search_field/cr_searc h_field.html"> |
| 6 <link rel="import" href="chrome://history/shared_style.html"> | 7 <link rel="import" href="chrome://history/shared_style.html"> |
| 7 | 8 |
| 8 <dom-module id="history-toolbar"> | 9 <dom-module id="history-toolbar"> |
| 9 <template> | 10 <template> |
| 10 <style include="shared-style"></style> | 11 <style include="shared-style"></style> |
| 11 <style> | 12 <style> |
| 12 :host { | 13 :host { |
| 13 background: rgb(63, 85, 102); | 14 background: rgb(63, 85, 102); |
| 14 color: #fff; | 15 color: #fff; |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 34 @apply(--layout-flex); | 35 @apply(--layout-flex); |
| 35 font-size: 16px; | 36 font-size: 16px; |
| 36 font-weight: 400; | 37 font-weight: 400; |
| 37 padding-left: 24px; | 38 padding-left: 24px; |
| 38 } | 39 } |
| 39 | 40 |
| 40 #search-input { | 41 #search-input { |
| 41 -webkit-padding-end: 20px; | 42 -webkit-padding-end: 20px; |
| 42 } | 43 } |
| 43 | 44 |
| 45 paper-spinner.search { | |
| 46 height: 20px; | |
| 47 width: 20px; | |
| 48 } | |
| 49 | |
| 44 #items { | 50 #items { |
| 45 margin: 0 auto; | 51 margin: 0 auto; |
| 46 max-width: var(--card-max-width); | 52 max-width: var(--card-max-width); |
| 47 } | 53 } |
| 48 | 54 |
| 49 #number-selected { | 55 #number-selected { |
| 50 @apply(--layout-flex); | 56 @apply(--layout-flex); |
| 51 } | 57 } |
| 52 | 58 |
| 53 paper-icon-button { | 59 paper-icon-button { |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 78 min-width: 100px; | 84 min-width: 100px; |
| 79 } | 85 } |
| 80 | 86 |
| 81 #back-padding { | 87 #back-padding { |
| 82 flex: 1 1 0; | 88 flex: 1 1 0; |
| 83 } | 89 } |
| 84 </style> | 90 </style> |
| 85 <div id="toolbar-container"> | 91 <div id="toolbar-container"> |
| 86 <div id="main-content" hidden$="[[itemsSelected_]]"> | 92 <div id="main-content" hidden$="[[itemsSelected_]]"> |
| 87 <h1 id="title">$i18n{title}</h1> | 93 <h1 id="title">$i18n{title}</h1> |
| 94 <div id="searching-spinner" hidden$="[[!searching_]]"> | |
|
tsergeant
2016/04/18 01:26:36
Nit: There's an extra space in here.
lshang
2016/04/22 01:25:03
Done.
| |
| 95 <paper-spinner class="search" active> | |
| 96 </paper-spinner> | |
| 97 </div> | |
| 88 <cr-search-field id="search-input" label="$i18n{search}" | 98 <cr-search-field id="search-input" label="$i18n{search}" |
| 89 clear-label="$i18n{clearSearch}"> | 99 clear-label="$i18n{clearSearch}"> |
| 90 </cr-search-field> | 100 </cr-search-field> |
| 91 </div> | 101 </div> |
| 92 | 102 |
| 93 <div id="items" hidden$="[[!itemsSelected_]]"> | 103 <div id="items" hidden$="[[!itemsSelected_]]"> |
| 94 <paper-icon-button icon="clear" id="cancel-icon-button" | 104 <paper-icon-button icon="clear" id="cancel-icon-button" |
| 95 on-tap="onClearSelectionTap_"></paper-icon-button> | 105 on-tap="onClearSelectionTap_"></paper-icon-button> |
| 96 <div id="number-selected">[[numberOfItemsSelected_(count)]]</div> | 106 <div id="number-selected">[[numberOfItemsSelected_(count)]]</div> |
| 97 <paper-button id="cancel-button" on-tap="onClearSelectionTap_"> | 107 <paper-button id="cancel-button" on-tap="onClearSelectionTap_"> |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 109 <paper-button on-tap="onClearBrowsingDataTap_" | 119 <paper-button on-tap="onClearBrowsingDataTap_" |
| 110 id="clear-browsing-data-button"> | 120 id="clear-browsing-data-button"> |
| 111 $i18n{clearBrowsingData} | 121 $i18n{clearBrowsingData} |
| 112 </paper-button> | 122 </paper-button> |
| 113 </div> | 123 </div> |
| 114 <div id="back-padding"></div> | 124 <div id="back-padding"></div> |
| 115 </div> | 125 </div> |
| 116 </template> | 126 </template> |
| 117 <script src="chrome://history/history_toolbar.js"></script> | 127 <script src="chrome://history/history_toolbar.js"></script> |
| 118 </dom-module> | 128 </dom-module> |
| OLD | NEW |