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

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

Issue 1729263005: MD History: Display synced tabs history. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mdh_shared_styles
Patch Set: address comments Created 4 years, 9 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
OLDNEW
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/roboto.css"> 7 <link rel="stylesheet" href="chrome://resources/css/roboto.css">
8 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css"> 8 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
9 9
10 <style> 10 <style>
11 html, 11 html,
12 body { 12 body {
13 height: 100%; 13 height: 100%;
14 margin: 0; 14 margin: 0;
15 } 15 }
16 16
17 body { 17 body {
18 background: #f2f2f2; 18 background: #f2f2f2;
19 display: flex; 19 display: flex;
20 flex-direction: column; 20 flex-direction: column;
21 font-family: Roboto; 21 font-family: Roboto;
22 font-size: 13px; 22 font-size: 13px;
23 min-width: 800px;
23 } 24 }
24 25
25 #toolbar { 26 #toolbar {
26 flex: 0 0 56px; 27 flex: 0 0 56px;
27 } 28 }
28 29
29 #history-list { 30 #history-list {
30 flex: 1 0 0; 31 flex: 1 0 0;
31 overflow: auto; 32 overflow: auto;
32 } 33 }
34
35 #history-synced-device-manager {
36 flex: 1 0 0;
37 }
38
39 #main-container {
40 display: flex;
41 flex: 1 0 0;
42 overflow: hidden;
43 }
33 </style> 44 </style>
34 </head> 45 </head>
35 46
36 <body> 47 <body>
37 <history-toolbar class="paper-header" id="toolbar"></history-toolbar> 48 <history-toolbar class="paper-header" id="toolbar"></history-toolbar>
38 <history-list id="history-list"></history-list> 49 <div id="main-container">
50 <history-side-bar id="history-side-bar"></history-side-bar>
51 <history-list id="history-list"></history-list>
52 <history-synced-device-manager id="history-synced-device-manager" hidden>
53 </history-synced-device-manager>
54 </div>
39 55
40 <link rel="import" href="chrome://resources/html/polymer_config.html"> 56 <link rel="import" href="chrome://resources/html/polymer_config.html">
41 <link rel="import" href="chrome://resources/html/cr.html"> 57 <link rel="import" href="chrome://resources/html/cr.html">
42 <link rel="import" href="chrome://resources/html/util.html"> 58 <link rel="import" href="chrome://resources/html/util.html">
43 <link rel="import" href="chrome://resources/html/load_time_data.html"> 59 <link rel="import" href="chrome://resources/html/load_time_data.html">
44 <script src="strings.js"></script> 60 <script src="strings.js"></script>
45 61
46 <link rel="import" href="chrome://history/history_list.html"> 62 <link rel="import" href="chrome://history/history_list.html">
47 <link rel="import" href="chrome://history/history_toolbar.html"> 63 <link rel="import" href="chrome://history/history_toolbar.html">
64 <link rel="import" href="chrome://history/synced_device_manager.html">
65 <link rel="import" href="chrome://history/side_bar.html">
48 66
49 <script src="history.js"></script> 67 <script src="history.js"></script>
50 68
51 <!-- Prepare strings and perform i18n substitutions. --> 69 <!-- Prepare strings and perform i18n substitutions. -->
52 <link rel="import" href="chrome://resources/html/i18n_template.html"> 70 <link rel="import" href="chrome://resources/html/i18n_template.html">
53 </body> 71 </body>
54 72
55 </html> 73 </html>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698