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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1607403004: MD History: Display synced tabs history (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@second_patch
Patch Set: Style fixes & having no synced history will hide the sidebar Created 4 years, 10 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 | « chrome/browser/resources/md_history/compiled_resources.gyp ('k') | chrome/browser/resources/md_history/history.js » ('j') | chrome/browser/resources/md_history/history.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
20 flex-direction: column;
19 font-family: Roboto; 21 font-family: Roboto;
20 font-size: 13px; 22 font-size: 13px;
21 display: flex;
22 flex-direction:column;
23 } 23 }
24 24
25 #toolbar { 25 #toolbar {
26 flex: 0 0 56px; 26 flex: 0 0 56px;
27 } 27 }
28 28
29 #history-card-manager { 29 #history-card-manager {
30 flex: 1 0 0; 30 flex: 1 0 0;
31 overflow: auto; 31 overflow: auto;
32 } 32 }
33
34 #synced-device-manager {
35 flex: 1 0 0;
36 padding-top: 40px;
37 }
38
39 #history-panel {
40 display: flex;
41 overflow: hidden;
42 }
33 </style> 43 </style>
34 </head> 44 </head>
35 45
36 <body> 46 <body>
37 <history-toolbar class="paper-header" id="toolbar"></history-toolbar> 47 <history-toolbar class="paper-header" id="toolbar"></history-toolbar>
38 <history-card-manager id="history-card-manager"></history-card-manager> 48 <div id="history-panel">
49 <side-bar id="side-bar"></side-bar>
50 <history-card-manager id="history-card-manager"></history-card-manager>
51 <synced-device-manager id="synced-device-manager" hidden>
52 </synced-device-manager>
53 </div>
39 54
40 <link rel="import" href="chrome://resources/html/polymer_config.html"> 55 <link rel="import" href="chrome://resources/html/polymer_config.html">
41 <link rel="import" href="chrome://resources/html/cr.html"> 56 <link rel="import" href="chrome://resources/html/cr.html">
42 <link rel="import" href="chrome://resources/html/util.html"> 57 <link rel="import" href="chrome://resources/html/util.html">
43 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html" > 58 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html" >
44 <link rel="import" href="chrome://history/history_card_manager.html"> 59 <link rel="import" href="chrome://history/history_card_manager.html">
45 <link rel="import" href="chrome://history/history_toolbar.html"> 60 <link rel="import" href="chrome://history/history_toolbar.html">
61 <link rel="import" href="chrome://history/synced_device_manager.html">
62 <link rel="import" href="chrome://history/side_bar.html">
46 63
47 <script src="history.js"></script> 64 <script src="history.js"></script>
48 65
49 <!-- Prepare strings and perform i18n substitutions. --> 66 <!-- Prepare strings and perform i18n substitutions. -->
50 <link rel="import" href="chrome://resources/html/load_time_data.html"> 67 <link rel="import" href="chrome://resources/html/load_time_data.html">
51 <script src="strings.js"></script> 68 <script src="strings.js"></script>
52 <link rel="import" href="chrome://resources/html/i18n_template.html"> 69 <link rel="import" href="chrome://resources/html/i18n_template.html">
53 </body> 70 </body>
54 71
55 </html> 72 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_history/compiled_resources.gyp ('k') | chrome/browser/resources/md_history/history.js » ('j') | chrome/browser/resources/md_history/history.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698