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/cr_elements/cr_search_field/cr_searc h_field.html"> | 5 <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"> | 6 <link rel="import" href="chrome://history/shared_style.html"> |
| 7 | 7 |
| 8 <dom-module id="history-toolbar"> | 8 <dom-module id="history-toolbar"> |
| 9 <template> | 9 <template> |
| 10 <style include="shared-style"></style> | 10 <style include="shared-style"></style> |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 @apply(--layout-flex); | 34 @apply(--layout-flex); |
| 35 font-size: 16px; | 35 font-size: 16px; |
| 36 font-weight: 400; | 36 font-weight: 400; |
| 37 padding-left: 24px; | 37 padding-left: 24px; |
| 38 } | 38 } |
| 39 | 39 |
| 40 #search-input { | 40 #search-input { |
| 41 -webkit-padding-end: 20px; | 41 -webkit-padding-end: 20px; |
| 42 } | 42 } |
| 43 | 43 |
| 44 #searching-spinner { | |
| 45 top: 15px; | |
|
tsergeant
2016/04/15 05:14:50
Is this necessary?
lshang
2016/04/18 00:29:00
Done.
| |
| 46 } | |
| 47 | |
| 48 paper-spinner.search { | |
| 49 height: 20px; | |
| 50 width: 20px; | |
| 51 } | |
| 52 | |
| 44 #items { | 53 #items { |
| 45 margin: 0 auto; | 54 margin: 0 auto; |
| 46 max-width: var(--card-max-width); | 55 max-width: var(--card-max-width); |
| 47 } | 56 } |
| 48 | 57 |
| 49 #number-selected { | 58 #number-selected { |
| 50 @apply(--layout-flex); | 59 @apply(--layout-flex); |
| 51 } | 60 } |
| 52 | 61 |
| 53 paper-icon-button { | 62 paper-icon-button { |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 78 min-width: 100px; | 87 min-width: 100px; |
| 79 } | 88 } |
| 80 | 89 |
| 81 #back-padding { | 90 #back-padding { |
| 82 flex: 1 1 0; | 91 flex: 1 1 0; |
| 83 } | 92 } |
| 84 </style> | 93 </style> |
| 85 <div id="toolbar-container"> | 94 <div id="toolbar-container"> |
| 86 <div id="main-content" hidden$="[[itemsSelected_]]"> | 95 <div id="main-content" hidden$="[[itemsSelected_]]"> |
| 87 <h1 id="title">$i18n{title}</h1> | 96 <h1 id="title">$i18n{title}</h1> |
| 97 <div id="searching-spinner" hidden$="[[!searching_]]"> | |
| 98 <paper-spinner class="search" alt="searching in history" active> | |
|
tsergeant
2016/04/15 05:14:50
Same comment here about localization.
However, si
lshang
2016/04/18 00:29:00
Done.
| |
| 99 </paper-spinner> | |
| 100 </div> | |
| 88 <cr-search-field id="search-input" label="$i18n{search}" | 101 <cr-search-field id="search-input" label="$i18n{search}" |
| 89 clear-label="$i18n{clearSearch}"> | 102 clear-label="$i18n{clearSearch}"> |
| 90 </cr-search-field> | 103 </cr-search-field> |
| 91 </div> | 104 </div> |
| 92 | 105 |
| 93 <div id="items" hidden$="[[!itemsSelected_]]"> | 106 <div id="items" hidden$="[[!itemsSelected_]]"> |
| 94 <paper-icon-button icon="clear" id="cancel-icon-button" | 107 <paper-icon-button icon="clear" id="cancel-icon-button" |
| 95 on-tap="onClearSelectionTap_"></paper-icon-button> | 108 on-tap="onClearSelectionTap_"></paper-icon-button> |
| 96 <div id="number-selected">[[numberOfItemsSelected_(count)]]</div> | 109 <div id="number-selected">[[numberOfItemsSelected_(count)]]</div> |
| 97 <paper-button id="cancel-button" on-tap="onClearSelectionTap_"> | 110 <paper-button id="cancel-button" on-tap="onClearSelectionTap_"> |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 109 <paper-button on-tap="onClearBrowsingDataTap_" | 122 <paper-button on-tap="onClearBrowsingDataTap_" |
| 110 id="clear-browsing-data-button"> | 123 id="clear-browsing-data-button"> |
| 111 $i18n{clearBrowsingData} | 124 $i18n{clearBrowsingData} |
| 112 </paper-button> | 125 </paper-button> |
| 113 </div> | 126 </div> |
| 114 <div id="back-padding"></div> | 127 <div id="back-padding"></div> |
| 115 </div> | 128 </div> |
| 116 </template> | 129 </template> |
| 117 <script src="chrome://history/history_toolbar.js"></script> | 130 <script src="chrome://history/history_toolbar.js"></script> |
| 118 </dom-module> | 131 </dom-module> |
| OLD | NEW |