Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Side by Side Diff: chrome/browser/resources/md_history/app.html

Issue 2073703002: MD History: Simplify flex layout in <history-list> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove flex usage from app and history.html Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/history.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #main-container,
34 history-synced-device-manager, 28 #content,
35 history-grouped-list { 29 #content > * {
36 flex: 1 0 0; 30 height: 100%;
37 } 31 }
38 32
39 #content { 33 #history-side-bar {
40 display: flex; 34 float: left;
tsergeant 2016/06/20 01:48:15 This will be going away "soon".
41 flex: 1 0 0;
42 overflow: hidden;
43 } 35 }
44 </style> 36 </style>
45 <history-toolbar id="toolbar" 37 <history-toolbar id="toolbar"
46 spinner-active="[[shouldShowSpinner_(queryState_.querying, 38 spinner-active="[[shouldShowSpinner_(queryState_.querying,
47 queryState_.incremental, 39 queryState_.incremental,
48 queryState_.searchTerm)]]" 40 queryState_.searchTerm)]]"
49 is-grouped-mode="{{grouped_}}" 41 is-grouped-mode="{{grouped_}}"
50 grouped-range="{{queryState_.range}}" 42 grouped-range="{{queryState_.range}}"
51 search-term="{{queryState_.searchTerm}}" 43 search-term="{{queryState_.searchTerm}}"
52 query-start-time="[[queryState_.info.queryStartTime]]" 44 query-start-time="[[queryState_.info.queryStartTime]]"
(...skipping 19 matching lines...) Expand all
72 <history-synced-device-manager id="history-synced-device-manager" 64 <history-synced-device-manager id="history-synced-device-manager"
73 session-list="[[queryState_.sessionList]]" 65 session-list="[[queryState_.sessionList]]"
74 searched-term=[[queryState_.info.term]]> 66 searched-term=[[queryState_.info.term]]>
75 </history-synced-device-manager> 67 </history-synced-device-manager>
76 </template> 68 </template>
77 </iron-pages> 69 </iron-pages>
78 </div> 70 </div>
79 </template> 71 </template>
80 <script src="chrome://history/app.js"></script> 72 <script src="chrome://history/app.js"></script>
81 </dom-module> 73 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/history.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698