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"> | 11 <style include="shared-style"> |
| 11 :host { | 12 :host { |
| 12 background: rgb(63, 85, 102); | 13 background: rgb(63, 85, 102); |
| 13 color: #fff; | 14 color: #fff; |
| 14 height: 56px; | 15 height: 56px; |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 44 | 45 |
| 45 :host([has-sidebar]) #left-content { | 46 :host([has-sidebar]) #left-content { |
| 46 flex: 1 0 var(--side-bar-width); | 47 flex: 1 0 var(--side-bar-width); |
| 47 } | 48 } |
| 48 | 49 |
| 49 #centered-buttons { | 50 #centered-buttons { |
| 50 flex: 0 1 var(--card-max-width); | 51 flex: 0 1 var(--card-max-width); |
| 51 padding: 0 var(--card-padding-side); | 52 padding: 0 var(--card-padding-side); |
| 52 } | 53 } |
| 53 | 54 |
| 55 #right-content { | |
| 56 @apply(--layout-center); | |
| 57 @apply(--layout-horizontal); | |
| 58 justify-content: flex-end; | |
| 59 } | |
| 60 | |
| 54 #search-input { | 61 #search-input { |
| 55 -webkit-padding-end: 20px; | 62 -webkit-padding-end: 20px; |
| 56 } | 63 } |
| 57 | 64 |
| 65 paper-spinner.search { | |
| 66 height: 20px; | |
| 67 width: 20px; | |
| 68 -webkit-padding-end: 10px; | |
| 69 } | |
| 70 | |
| 58 #overlay-buttons { | 71 #overlay-buttons { |
| 59 margin: 0 auto; | 72 margin: 0 auto; |
| 60 max-width: var(--card-max-width); | 73 max-width: var(--card-max-width); |
| 61 padding: 0 var(--card-padding-side); | 74 padding: 0 var(--card-padding-side); |
| 62 } | 75 } |
| 63 | 76 |
| 64 :host([has-sidebar]) #overlay-wrapper { | 77 :host([has-sidebar]) #overlay-wrapper { |
| 65 -webkit-margin-start: var(--side-bar-width); | 78 -webkit-margin-start: var(--side-bar-width); |
| 66 } | 79 } |
| 67 | 80 |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 86 <div id="left-content"> | 99 <div id="left-content"> |
| 87 <h1 id="title">$i18n{title}</h1> | 100 <h1 id="title">$i18n{title}</h1> |
| 88 </div> | 101 </div> |
| 89 <div id="centered-buttons"> | 102 <div id="centered-buttons"> |
| 90 <paper-button on-tap="onClearBrowsingDataTap_" | 103 <paper-button on-tap="onClearBrowsingDataTap_" |
| 91 id="clear-browsing-data-button"> | 104 id="clear-browsing-data-button"> |
| 92 $i18n{clearBrowsingData} | 105 $i18n{clearBrowsingData} |
| 93 </paper-button> | 106 </paper-button> |
| 94 </div> | 107 </div> |
| 95 <div id="right-content"> | 108 <div id="right-content"> |
| 109 <div id="searching-spinner" hidden$="[[!searching]]"> | |
| 110 <paper-spinner class="search" active> | |
|
tsergeant
2016/04/22 02:18:44
Nit: Instead of class="search", you can move id="s
lshang
2016/04/22 04:08:46
Done.
After I removed the class and moved id "sea
| |
| 111 </paper-spinner> | |
| 112 </div> | |
| 96 <cr-search-field id="search-input" label="$i18n{search}" | 113 <cr-search-field id="search-input" label="$i18n{search}" |
| 97 clear-label="$i18n{clearSearch}"> | 114 clear-label="$i18n{clearSearch}"> |
| 98 </cr-search-field> | 115 </cr-search-field> |
| 99 </div> | 116 </div> |
| 100 </div> | 117 </div> |
| 101 | 118 |
| 102 <div id="overlay-wrapper" hidden$="[[!itemsSelected_]]"> | 119 <div id="overlay-wrapper" hidden$="[[!itemsSelected_]]"> |
| 103 <div id="overlay-buttons"> | 120 <div id="overlay-buttons"> |
| 104 <paper-icon-button icon="clear" id="cancel-icon-button" | 121 <paper-icon-button icon="clear" id="cancel-icon-button" |
| 105 on-tap="onClearSelectionTap_"></paper-icon-button> | 122 on-tap="onClearSelectionTap_"></paper-icon-button> |
| 106 <div id="number-selected">[[numberOfItemsSelected_(count)]]</div> | 123 <div id="number-selected">[[numberOfItemsSelected_(count)]]</div> |
| 107 <paper-button id="cancel-button" on-tap="onClearSelectionTap_"> | 124 <paper-button id="cancel-button" on-tap="onClearSelectionTap_"> |
| 108 $i18n{cancel} | 125 $i18n{cancel} |
| 109 </paper-button> | 126 </paper-button> |
| 110 <paper-button id="delete-button" on-tap="onDeleteTap_"> | 127 <paper-button id="delete-button" on-tap="onDeleteTap_"> |
| 111 $i18n{delete} | 128 $i18n{delete} |
| 112 </paper-button> | 129 </paper-button> |
| 113 </div> | 130 </div> |
| 114 </div> | 131 </div> |
| 115 </div> | 132 </div> |
| 116 </template> | 133 </template> |
| 117 <script src="chrome://history/history_toolbar.js"></script> | 134 <script src="chrome://history/history_toolbar.js"></script> |
| 118 </dom-module> | 135 </dom-module> |
| OLD | NEW |