| OLD | NEW |
| 1 <!doctype html> | 1 <!doctype html> |
| 2 <html i18n-values="dir:textdirection;lang:language"> | 2 <html i18n-values="dir:textdirection;lang:language"> |
| 3 <head> | 3 <head> |
| 4 <meta charset="utf8"> | 4 <meta charset="utf8"> |
| 5 <title i18n-content="title"></title> | 5 <title i18n-content="title"></title> |
| 6 | 6 |
| 7 <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css"> | 7 <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css"> |
| 8 | 8 |
| 9 <style> | 9 <style> |
| 10 html, | 10 html, |
| 11 body { | 11 body { |
| 12 height: 100%; | 12 height: 100%; |
| 13 margin: 0; | 13 margin: 0; |
| 14 } | 14 } |
| 15 | 15 |
| 16 body { | 16 body { |
| 17 background: #f2f2f2; | 17 background: #f2f2f2; |
| 18 display: flex; | 18 display: flex; |
| 19 flex-direction: column; | 19 flex-direction: column; |
| 20 min-width: 800px; |
| 20 } | 21 } |
| 21 | 22 |
| 22 #toolbar { | 23 #toolbar { |
| 23 flex: 0 0 56px; | 24 flex: 0 0 56px; |
| 24 } | 25 } |
| 25 | 26 |
| 26 #history-list { | 27 #history-list { |
| 27 flex: 1 0 0; | 28 flex: 1 0 0; |
| 28 overflow: auto; | 29 overflow: auto; |
| 29 } | 30 } |
| 31 |
| 32 #history-synced-device-manager { |
| 33 flex: 1 0 0; |
| 34 } |
| 35 |
| 36 #main-container { |
| 37 display: flex; |
| 38 flex: 1 0 0; |
| 39 overflow: hidden; |
| 40 } |
| 30 </style> | 41 </style> |
| 31 </head> | 42 </head> |
| 32 | 43 |
| 33 <body> | 44 <body> |
| 34 <history-toolbar class="paper-header" id="toolbar"></history-toolbar> | 45 <history-toolbar class="paper-header" id="toolbar"></history-toolbar> |
| 35 <history-list id="history-list"></history-list> | 46 <div id="main-container"> |
| 47 <history-side-bar id="history-side-bar"></history-side-bar> |
| 48 <history-list id="history-list"></history-list> |
| 49 <history-synced-device-manager id="history-synced-device-manager" hidden> |
| 50 </history-synced-device-manager> |
| 51 </div> |
| 36 | 52 |
| 37 <link rel="import" href="chrome://resources/html/polymer_config.html"> | 53 <link rel="import" href="chrome://resources/html/polymer_config.html"> |
| 38 <link rel="import" href="chrome://resources/html/cr.html"> | 54 <link rel="import" href="chrome://resources/html/cr.html"> |
| 39 <link rel="import" href="chrome://resources/html/util.html"> | 55 <link rel="import" href="chrome://resources/html/util.html"> |
| 40 <link rel="import" href="chrome://resources/html/load_time_data.html"> | 56 <link rel="import" href="chrome://resources/html/load_time_data.html"> |
| 41 <script src="strings.js"></script> | 57 <script src="strings.js"></script> |
| 42 | 58 |
| 43 <link rel="import" href="chrome://history/constants.html"> | 59 <link rel="import" href="chrome://history/constants.html"> |
| 44 <link rel="import" href="chrome://history/history_list.html"> | 60 <link rel="import" href="chrome://history/history_list.html"> |
| 45 <link rel="import" href="chrome://history/history_toolbar.html"> | 61 <link rel="import" href="chrome://history/history_toolbar.html"> |
| 62 <link rel="import" href="chrome://history/synced_device_manager.html"> |
| 63 <link rel="import" href="chrome://history/side_bar.html"> |
| 46 | 64 |
| 47 <script src="history.js"></script> | 65 <script src="history.js"></script> |
| 48 | 66 |
| 49 <!-- Prepare strings and perform i18n substitutions. --> | 67 <!-- Prepare strings and perform i18n substitutions. --> |
| 50 <link rel="import" href="chrome://resources/html/i18n_template.html"> | 68 <link rel="import" href="chrome://resources/html/i18n_template.html"> |
| 51 </body> | 69 </body> |
| 52 | 70 |
| 53 </html> | 71 </html> |
| OLD | NEW |