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 7e46840aaecb2f0b335050475f80a812eb09b247..37bc635ce00141966f9573f8b6210e828ffdd55b 100644 |
--- a/chrome/browser/resources/md_history/history_toolbar.html |
+++ b/chrome/browser/resources/md_history/history_toolbar.html |
@@ -24,14 +24,15 @@ |
h1 { |
@apply(--layout-flex); |
+ @apply(--layout-horizontal); |
font-size: 16px; |
font-weight: 400; |
padding-left: 24px; |
} |
- #items { |
- @apply(--layout-center); |
+ .items { |
@apply(--layout-horizontal); |
+ @apply(--layout-center); |
margin: 0 auto; |
max-width: 960px; |
width: 100%; |
@@ -47,29 +48,71 @@ |
min-width: 36px; |
width: 36px; |
} |
- </style> |
- <template is="dom-if" if="{{!itemsSelected_}}"> |
- <h1 i18n-content="title" id="title"></h1> |
- <cr-search-field id="search-input" |
- i18n-values="label:search;clear-label:clearSearch"></cr-search-field> |
- </template> |
+ #clear-browsing-data { |
+ flex: 1 1 960px; |
+ max-width: 960px; |
+ pointer-events: auto; |
+ } |
+ |
+ #button-container { |
+ @apply(--layout-horizontal); |
+ @apply(--layout-center); |
+ @apply(--layout-center-justified); |
tsergeant
2016/02/03 22:57:11
Is this one necessary?
yingran
2016/02/03 23:25:52
Done.
|
+ height: inherit; |
+ left: 0; |
+ pointer-events: none; |
+ position: absolute; |
+ top: 0; |
+ width: 100%; |
+ } |
+ |
+ #toolbar-container { |
+ @apply(--layout-horizontal); |
+ @apply(--layout-center); |
+ width: 100%; |
+ } |
- <template is="dom-if" if="{{itemsSelected_}}"> |
- <div id="items"> |
- <paper-icon-button icon="clear" id="cancel-icon-button" |
- on-tap="onClearSelectionTap_"> |
- </paper-icon-button> |
- <!-- TODO: change "selected" and number to an i18n (or equivalent) |
- string --> |
- <div id="number-selected">{{count}} selected</div> |
- <paper-button id="cancel-button" on-tap="onClearSelectionTap_"> |
- CANCEL |
+ #front-padding { |
+ flex: 1 1 0; |
+ min-width: 80px; |
tsergeant
2016/02/03 22:57:11
I would prefer it if this was a bit bigger -- in t
yingran
2016/02/03 23:25:52
Done.
|
+ } |
+ |
+ #back-padding { |
+ flex: 1 1 0; |
+ pointer-events: none; |
+ } |
+ </style> |
+ <div id="toolbar-container"> |
+ <template is="dom-if" if="{{!itemsSelected_}}"> |
+ <h1 i18n-content="title" id="title"></h1> |
+ <cr-search-field id="search-input" |
+ i18n-values="label:search;clear-label:clearSearch"></cr-search-field> |
+ </template> |
+ |
+ <template is="dom-if" if="{{itemsSelected_}}"> |
+ <div class="items"> |
+ <paper-icon-button icon="clear" id="cancel-icon-button" |
+ on-tap="onClearSelectionTap_"> |
+ </paper-icon-button> |
+ <!-- TODO: change "selected" and number to an i18n (or equivalent) |
+ string --> |
+ <div id="number-selected">{{count}} selected</div> |
+ <paper-button id="cancel-button" on-tap="onClearSelectionTap_"> |
+ CANCEL |
+ </paper-button> |
+ <paper-button id="delete-button">DELETE</paper-button> |
+ </div> |
+ </template> |
+ </div> |
+ <div id="button-container"> |
tsergeant
2016/02/03 22:57:11
This is all still visible when there are items sel
yingran
2016/02/03 23:25:52
Done.
|
+ <div id="front-padding"></div> |
+ <div id="clear-browsing-data"> |
+ <paper-button on-tap="clearBrowsingData" i18n-content="clearBrowsingData"> |
</paper-button> |
- <paper-button id="delete-button">DELETE</paper-button> |
</div> |
- </template> |
- |
+ <div id="back-padding"></div> |
+ </div> |
</template> |
<script src="chrome://history/history_toolbar.js"></script> |
</dom-module> |