Chromium Code Reviews| 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 a2af6fb18e788b27dc0f7c68020b520438cdfa78..283f667793420b49ee8ecc591c734a8bdfeacb2b 100644 |
| --- a/chrome/browser/resources/md_history/history.html |
| +++ b/chrome/browser/resources/md_history/history.html |
| @@ -6,11 +6,45 @@ |
| <link rel="stylesheet" href="chrome://resources/css/roboto.css"> |
| <link rel="stylesheet" href="chrome://resources/css/text_defaults.css"> |
| + |
| + <style> |
| + html, |
| + body { |
| + height: 100%; |
| + margin: 0; |
| + } |
| + |
| + body { |
| + background: #f2f2f2; |
| + font-family: Roboto; |
| + font-size: 13px; |
| + display: flex; |
| + flex-direction:column; |
| + } |
| + |
| + #toolbar { |
| + flex: 0 0 56px; |
| + } |
| + |
| + #history-card-manager { |
| + flex: 1 0 0; |
| + overflow: auto; |
| + } |
| + </style> |
| </head> |
| <body> |
| - <h1 i18n-content="title"></h1> |
| + <history-toolbar class="paper-header" id="toolbar"></history-toolbar> |
| + <history-card-manager id="history-card-manager"></history-card-manager> |
| + |
| <link rel="import" href="chrome://resources/html/polymer_config.html"> |
| + <link rel="import" href="chrome://resources/html/cr.html"> |
| + <link rel="import" href="chrome://resources/html/util.html"> |
| + <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
|
tsergeant
2016/01/22 02:37:11
There shouldn't be any need to include Polymer her
hsampson
2016/01/22 05:05:03
Done.
|
| + <link rel="import" href="chrome://history/history_card_manager.html"> |
| + <link rel="import" href="chrome://history/history_toolbar.html"> |
| + |
| + <script src="history.js"></script> |
| <!-- Prepare strings and perform i18n substitutions. --> |
| <link rel="import" href="chrome://resources/html/load_time_data.html"> |