Chromium Code Reviews| Index: chrome/browser/resources/md_history/history_toolbar.html |
| diff --git a/chrome/browser/resources/md_history/history_toolbar.html b/chrome/browser/resources/md_history/history_toolbar.html |
| index 32fd2d8c300937efa69ee3cfcf6d1062c6ce502a..c185f1d385f4e43db7a67a68e6f0f92db17e7c81 100644 |
| --- a/chrome/browser/resources/md_history/history_toolbar.html |
| +++ b/chrome/browser/resources/md_history/history_toolbar.html |
| @@ -29,6 +29,7 @@ |
| h1 { |
| @apply(--layout-flex); |
| + @apply(--layout-horizontal); |
| font-size: 16px; |
| font-weight: 400; |
| padding-left: 24px; |
| @@ -50,26 +51,74 @@ |
| width: 36px; |
| } |
| + #clear-browsing-data { |
| + flex: 1 1 960px; |
| + max-width: 960px; |
| + pointer-events: auto; |
|
calamity
2016/02/05 00:43:37
This pointer-events style needs to be on the butto
yingran
2016/02/05 04:53:16
Done.
|
| + } |
| + |
| + :host([items-selected_]) #clear-browsing-data { |
| + display: none; |
| + } |
| + |
| + #button-container { |
| + @apply(--layout-horizontal); |
| + @apply(--layout-center); |
| + height: inherit; |
| + left: 0; |
| + pointer-events: none; |
| + position: absolute; |
| + top: 0; |
| + width: 100%; |
| + } |
| + |
| + #toolbar-container { |
| + @apply(--layout-horizontal); |
| + @apply(--layout-center); |
| + width: 100%; |
| + } |
| + |
| + #front-padding { |
| + flex: 1 1 0; |
| + min-width: 100px; |
| + } |
| + |
| + #back-padding { |
| + flex: 1 1 0; |
| + pointer-events: none; |
|
calamity
2016/02/05 00:43:38
Remove.
yingran
2016/02/05 04:53:16
Done.
|
| + } |
| + |
| [hidden] { |
| display: none !important; |
| } |
| </style> |
| - <div id="main-content" hidden$="{{itemsSelected_}}"> |
| - <h1 i18n-content="title" id="title"></h1> |
| - <cr-search-field id="search-input" |
| - i18n-values="label:search;clear-label:clearSearch"></cr-search-field> |
| - </div> |
| + <div id="toolbar-container"> |
| + <div id="main-content" hidden$="{{itemsSelected_}}"> |
| + <h1 i18n-content="title" id="title"></h1> |
| + <cr-search-field id="search-input" |
| + i18n-values="label:search;clear-label:clearSearch"></cr-search-field> |
| + </div> |
| - <div id="items" hidden$="{{!itemsSelected_}}"> |
| - <paper-icon-button icon="clear" id="cancel-icon-button" |
| - on-tap="onClearSelectionTap_"></paper-icon-button> |
| - <div id="number-selected">{{numberOfItemsSelected_(count)}}</div> |
| - <paper-button id="cancel-button" on-tap="onClearSelectionTap_" |
| - i18n-content="cancel"></paper-button> |
| - <paper-button id="delete-button" i18n-content="delete"></paper-button> |
| + <div id="items" hidden$="{{!itemsSelected_}}"> |
| + <paper-icon-button icon="clear" id="cancel-icon-button" |
| + on-tap="onClearSelectionTap_"></paper-icon-button> |
| + <div id="number-selected">{{numberOfItemsSelected_(count)}}</div> |
| + <paper-button id="cancel-button" on-tap="onClearSelectionTap_" |
| + i18n-content="cancel"></paper-button> |
| + <paper-button id="delete-button" i18n-content="delete"></paper-button> |
| + </div> |
| </div> |
| + <div id="button-container"> |
| + <div id="front-padding"></div> |
| + <div id="clear-browsing-data"> |
|
tsergeant
2016/02/05 00:16:03
Use hidden$= here instead of hiding with CSS, sinc
yingran
2016/02/05 04:53:16
Done.
|
| + <paper-button on-tap="onClearBrowsingDataTap_" |
| + i18n-content="clearBrowsingData"> |
| + </paper-button> |
| + </div> |
| + <div id="back-padding"></div> |
| + </div> |
| </template> |
| <script src="chrome://history/history_toolbar.js"></script> |
| </dom-module> |