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"> | |
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> |
4 <link rel="import" href="chrome://history/grouped_list.html"> | 3 <link rel="import" href="chrome://history/grouped_list.html"> |
5 <link rel="import" href="chrome://history/history_list.html"> | 4 <link rel="import" href="chrome://history/history_list.html"> |
6 <link rel="import" href="chrome://history/history_toolbar.html"> | 5 <link rel="import" href="chrome://history/history_toolbar.html"> |
7 <link rel="import" href="chrome://history/synced_device_manager.html"> | 6 <link rel="import" href="chrome://history/synced_device_manager.html"> |
8 <link rel="import" href="chrome://history/side_bar.html"> | 7 <link rel="import" href="chrome://history/side_bar.html"> |
9 <link rel="import" href="chrome://history/shared_style.html"> | 8 <link rel="import" href="chrome://history/shared_style.html"> |
10 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> | 9 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> |
11 | 10 |
12 <dom-module id="history-app"> | 11 <dom-module id="history-app"> |
13 <!-- TODO(calamity): work around this deprecated import style --> | 12 <!-- TODO(calamity): work around this deprecated import style --> |
14 <template> | 13 <template> |
15 <style no-process> | 14 <style no-process> |
16 history-toolbar { | 15 history-toolbar { |
17 background: var(--md-toolbar-color); | 16 background: var(--md-toolbar-color); |
18 } | 17 } |
19 </style> | 18 </style> |
20 <style include="shared-style"> | 19 <style include="shared-style"> |
21 :host { | 20 :host { |
22 display: flex; | 21 display: block; |
23 flex-direction: column; | 22 height: 100%; |
24 min-width: 800px; | 23 min-width: 800px; |
25 } | |
26 | |
27 #main-container { | |
28 display: flex; | |
29 flex: 1 0 0; | |
30 overflow: hidden; | 24 overflow: hidden; |
31 } | 25 } |
32 | 26 |
33 history-list, | 27 /* Sizing this with flex causes slow load performance, see |
34 history-synced-device-manager, | 28 crbug.com/618153. */ |
35 history-grouped-list { | 29 #main-container { |
36 flex: 1 0 0; | 30 height: calc(100% - var(--toolbar-height)); |
37 } | 31 } |
38 | 32 |
39 #content { | 33 :host([grouped_]) #main-container { |
40 display: flex; | 34 height: calc(100% - var(--toolbar-grouped-height)); |
41 flex: 1 0 0; | 35 } |
42 overflow: hidden; | 36 |
37 #content, | |
38 #content > * { | |
39 height: 100%; | |
40 } | |
41 | |
42 #history-side-bar { | |
43 float: left; | |
Dan Beam
2016/08/23 21:01:18
this doesn't flip in RTL in case you thought it wo
| |
43 } | 44 } |
44 </style> | 45 </style> |
45 <history-toolbar id="toolbar" | 46 <history-toolbar id="toolbar" |
46 spinner-active="[[shouldShowSpinner_(queryState_.querying, | 47 spinner-active="[[shouldShowSpinner_(queryState_.querying, |
47 queryState_.incremental, | 48 queryState_.incremental, |
48 queryState_.searchTerm)]]" | 49 queryState_.searchTerm)]]" |
49 is-grouped-mode="{{grouped_}}" | 50 is-grouped-mode="{{grouped_}}" |
50 grouped-range="{{queryState_.range}}" | 51 grouped-range="{{queryState_.range}}" |
51 search-term="{{queryState_.searchTerm}}" | 52 search-term="{{queryState_.searchTerm}}" |
52 query-start-time="[[queryState_.info.queryStartTime]]" | 53 query-start-time="[[queryState_.info.queryStartTime]]" |
(...skipping 19 matching lines...) Expand all Loading... | |
72 <history-synced-device-manager id="history-synced-device-manager" | 73 <history-synced-device-manager id="history-synced-device-manager" |
73 session-list="[[queryState_.sessionList]]" | 74 session-list="[[queryState_.sessionList]]" |
74 searched-term=[[queryState_.info.term]]> | 75 searched-term=[[queryState_.info.term]]> |
75 </history-synced-device-manager> | 76 </history-synced-device-manager> |
76 </template> | 77 </template> |
77 </iron-pages> | 78 </iron-pages> |
78 </div> | 79 </div> |
79 </template> | 80 </template> |
80 <script src="chrome://history/app.js"></script> | 81 <script src="chrome://history/app.js"></script> |
81 </dom-module> | 82 </dom-module> |
OLD | NEW |