| Index: chrome/browser/resources/md_history/history.html
|
| diff --git a/chrome/browser/resources/md_history/history.html b/chrome/browser/resources/md_history/history.html
|
| index 283f667793420b49ee8ecc591c734a8bdfeacb2b..cab95c92f1ebed8534a6d8f6e2b416e8816541e7 100644
|
| --- a/chrome/browser/resources/md_history/history.html
|
| +++ b/chrome/browser/resources/md_history/history.html
|
| @@ -16,10 +16,10 @@
|
|
|
| body {
|
| background: #f2f2f2;
|
| + display: flex;
|
| + flex-direction: column;
|
| font-family: Roboto;
|
| font-size: 13px;
|
| - display: flex;
|
| - flex-direction:column;
|
| }
|
|
|
| #toolbar {
|
| @@ -30,12 +30,27 @@
|
| flex: 1 0 0;
|
| overflow: auto;
|
| }
|
| +
|
| + #synced-device-manager {
|
| + flex: 1 0 0;
|
| + padding-top: 40px;
|
| + }
|
| +
|
| + #history-panel {
|
| + display: flex;
|
| + overflow: hidden;
|
| + }
|
| </style>
|
| </head>
|
|
|
| <body>
|
| <history-toolbar class="paper-header" id="toolbar"></history-toolbar>
|
| - <history-card-manager id="history-card-manager"></history-card-manager>
|
| + <div id="history-panel">
|
| + <side-bar id="side-bar"></side-bar>
|
| + <history-card-manager id="history-card-manager"></history-card-manager>
|
| + <synced-device-manager id="synced-device-manager" hidden>
|
| + </synced-device-manager>
|
| + </div>
|
|
|
| <link rel="import" href="chrome://resources/html/polymer_config.html">
|
| <link rel="import" href="chrome://resources/html/cr.html">
|
| @@ -43,6 +58,8 @@
|
| <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
|
| <link rel="import" href="chrome://history/history_card_manager.html">
|
| <link rel="import" href="chrome://history/history_toolbar.html">
|
| + <link rel="import" href="chrome://history/synced_device_manager.html">
|
| + <link rel="import" href="chrome://history/side_bar.html">
|
|
|
| <script src="history.js"></script>
|
|
|
|
|