Index: chrome/browser/resources/md_history/app.html |
diff --git a/chrome/browser/resources/md_history/app.html b/chrome/browser/resources/md_history/app.html |
index a8f8a6fde0ce5ee5905296e8ae80d34d17e1e42f..1710ce8f0cb7003e48c17fd957019ad56ce141d7 100644 |
--- a/chrome/browser/resources/md_history/app.html |
+++ b/chrome/browser/resources/md_history/app.html |
@@ -1,5 +1,4 @@ |
<link rel="import" href="chrome://resources/html/polymer.html"> |
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.html"> |
<link rel="import" href="chrome://history/grouped_list.html"> |
<link rel="import" href="chrome://history/history_list.html"> |
@@ -19,27 +18,20 @@ |
</style> |
<style include="shared-style"> |
:host { |
- display: flex; |
- flex-direction: column; |
+ display: block; |
+ height: 100%; |
min-width: 800px; |
- } |
- |
- #main-container { |
- display: flex; |
- flex: 1 0 0; |
overflow: hidden; |
} |
- history-list, |
- history-synced-device-manager, |
- history-grouped-list { |
- flex: 1 0 0; |
+ #main-container, |
+ #content, |
+ #content > * { |
+ height: 100%; |
} |
- #content { |
- display: flex; |
- flex: 1 0 0; |
- overflow: hidden; |
+ #history-side-bar { |
+ float: left; |
tsergeant
2016/06/20 01:48:15
This will be going away "soon".
|
} |
</style> |
<history-toolbar id="toolbar" |