| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> |
| 4 <link rel="import" href="chrome://history/history_list.html"> | 4 <link rel="import" href="chrome://history/history_list.html"> |
| 5 <link rel="import" href="chrome://history/history_toolbar.html"> | 5 <link rel="import" href="chrome://history/history_toolbar.html"> |
| 6 <link rel="import" href="chrome://history/synced_device_manager.html"> | 6 <link rel="import" href="chrome://history/synced_device_manager.html"> |
| 7 <link rel="import" href="chrome://history/side_bar.html"> | 7 <link rel="import" href="chrome://history/side_bar.html"> |
| 8 <link rel="import" href="chrome://history/shared_style.html"> | 8 <link rel="import" href="chrome://history/shared_style.html"> |
| 9 | 9 |
| 10 <dom-module id="history-app"> | 10 <dom-module id="history-app"> |
| 11 <!-- TODO(calamity): work around this deprecated import style --> | 11 <!-- TODO(calamity): work around this deprecated import style --> |
| 12 <link rel="import" type="css" href="chrome://resources/css/md_colors.css"> | 12 <link rel="import" type="css" href="chrome://resources/css/md_colors.css"> |
| 13 <template> | 13 <template> |
| 14 <style include="shared-style"> | 14 <style include="shared-style"> |
| 15 :host { | 15 :host { |
| 16 display: flex; | 16 display: flex; |
| 17 flex-direction: column; | 17 flex-direction: column; |
| 18 min-width: 800px; | 18 min-width: 800px; |
| 19 } | 19 } |
| 20 | 20 |
| 21 #main-container { | 21 #main-container { |
| 22 display: flex; | 22 display: flex; |
| 23 flex: 1 0 0; | 23 flex: 1 0 0; |
| 24 overflow: hidden; | 24 overflow: hidden; |
| 25 } | 25 } |
| 26 | 26 |
| 27 #toolbar { | |
| 28 flex: 0 0 56px; | |
| 29 } | |
| 30 | |
| 31 history-list, | 27 history-list, |
| 32 #history-synced-device-manager { | 28 #history-synced-device-manager { |
| 33 flex: 1 0 0; | 29 flex: 1 0 0; |
| 34 } | 30 } |
| 35 | 31 |
| 36 #content { | 32 #content { |
| 37 display: flex; | 33 display: flex; |
| 38 flex: 1 0 0; | 34 flex: 1 0 0; |
| 39 } | 35 } |
| 40 | 36 |
| 41 history-toolbar { | 37 history-toolbar { |
| 42 background: var(--md-toolbar-color); | 38 background: var(--md-toolbar-color); |
| 43 } | 39 } |
| 44 </style> | 40 </style> |
| 45 <history-toolbar class="paper-header" id="toolbar"></history-toolbar> | 41 <history-toolbar id="toolbar"></history-toolbar> |
| 46 | 42 |
| 47 <div id="main-container"> | 43 <div id="main-container"> |
| 48 <history-side-bar id="history-side-bar" selected-page="{{selectedPage}}"> | 44 <history-side-bar id="history-side-bar" selected-page="{{selectedPage}}"> |
| 49 </history-side-bar> | 45 </history-side-bar> |
| 50 <iron-pages id="content" attr-for-selected="id" | 46 <iron-pages id="content" attr-for-selected="id" |
| 51 selected="{{selectedPage}}"> | 47 selected="{{selectedPage}}"> |
| 52 <history-list id="history-list"></history-list> | 48 <history-list id="history-list"></history-list> |
| 53 <history-synced-device-manager id="history-synced-device-manager"> | 49 <history-synced-device-manager id="history-synced-device-manager"> |
| 54 </history-synced-device-manager> | 50 </history-synced-device-manager> |
| 55 </iron-pages> | 51 </iron-pages> |
| 56 </div> | 52 </div> |
| 57 </template> | 53 </template> |
| 58 <script src="chrome://history/app.js"></script> | 54 <script src="chrome://history/app.js"></script> |
| 59 </dom-module> | 55 </dom-module> |
| OLD | NEW |