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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1932413003: [MD History] Refactor history.html into a history-app element. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« chrome/browser/resources/md_history/app.js ('K') | « chrome/browser/resources/md_history/elements.html ('k') | chrome/browser/resources/md_history/history.js » ('j') | no next file with comments »
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 dir="$i18n{textdirection}" lang="$i18n{language}"> 2 <html dir="$i18n{textdirection}" lang="$i18n{language}">
3 <head> 3 <head>
4 <meta charset="utf8"> 4 <meta charset="utf8">
5 <title>$i18n{title}</title> 5 <title>$i18n{title}</title>
6 6
7 <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css"> 7 <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
8 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> 8 <link rel="stylesheet" href="chrome://resources/css/md_colors.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: var(--md-background-color); 18 background: var(--md-background-color);
19 display: flex; 19 display: flex;
20 flex-direction: column; 20 flex-direction: column;
21 min-width: 800px;
22 }
23
24 #toolbar {
25 flex: 0 0 56px;
26 }
27
28 #history-list {
29 flex: 1 0 0;
30 overflow: auto;
31 }
32
33 #history-synced-device-manager {
34 flex: 1 0 0;
35 }
36
37 #main-container {
38 display: flex;
39 flex: 1 0 0;
40 overflow: hidden;
41 } 21 }
42 22
43 /* Minimal styling required to display app shim. */ 23 /* Minimal styling required to display app shim. */
44 .loading #main-container, 24 .loading history-app,
45 .loading history-toolbar,
46 .app-shim { 25 .app-shim {
47 display: none; 26 display: none;
48 } 27 }
49 28
29 history-app {
30 flex: 1;
31 }
32
50 .loading .app-shim { 33 .loading .app-shim {
51 display: flex; 34 display: flex;
52 font-size: 123%; 35 font-size: 123%;
53 } 36 }
54 37
55 .loading #loading-toolbar { 38 .loading #loading-toolbar {
56 -webkit-padding-start: 24px; 39 -webkit-padding-start: 24px;
57 align-items: center; 40 align-items: center;
58 color: #fff; 41 color: #fff;
59 flex-direction: row; 42 flex-direction: row;
60 font-weight: 400; 43 font-weight: 400;
61 height: 56px; 44 height: 56px;
62 } 45 }
63 46
64 history-toolbar,
65 .loading #loading-toolbar { 47 .loading #loading-toolbar {
66 background: var(--md-toolbar-color); 48 background: var(--md-toolbar-color);
67 } 49 }
68 50
69 .loading #loading-message { 51 .loading #loading-message {
70 align-items: center; 52 align-items: center;
71 color: #b4b4b4; 53 color: #b4b4b4;
72 flex: 1; 54 flex: 1;
73 font-weight: 500; 55 font-weight: 500;
74 justify-content: center; 56 justify-content: center;
75 } 57 }
76 </style> 58 </style>
77 </head> 59 </head>
78 60
79 <body class="loading"> 61 <body class="loading">
80 <history-toolbar class="paper-header" id="toolbar"></history-toolbar> 62 <history-app id="history-app"></history-app>
81
82 <div id="main-container">
83 <history-side-bar id="history-side-bar"></history-side-bar>
84 <history-list id="history-list"></history-list>
85 <history-synced-device-manager id="history-synced-device-manager" hidden>
86 </history-synced-device-manager>
87 </div>
88
89 <span class="app-shim" id="loading-toolbar">$i18n{title}</span> 63 <span class="app-shim" id="loading-toolbar">$i18n{title}</span>
90 <span class="app-shim" id="loading-message">$i18n{loading}</span> 64 <span class="app-shim" id="loading-message">$i18n{loading}</span>
91 65
92 <link rel="import" href="chrome://resources/html/cr.html"> 66 <link rel="import" href="chrome://resources/html/cr.html">
93 <link rel="import" href="chrome://resources/html/util.html"> 67 <link rel="import" href="chrome://resources/html/util.html">
94 <link rel="import" href="chrome://resources/html/load_time_data.html"> 68 <link rel="import" href="chrome://resources/html/load_time_data.html">
95 <link rel="import" href="chrome://history/constants.html"> 69 <link rel="import" href="chrome://history/constants.html">
96 <script src="strings.js"></script> 70 <script src="strings.js"></script>
97 <script src="history.js"></script> 71 <script src="history.js"></script>
98 72
99 <link rel="import" href="chrome://history/elements.html" async id="bundle"> 73 <link rel="import" href="chrome://history/elements.html" async id="bundle">
tsergeant 2016/05/02 16:19:20 Remove elements.html entirely and just import app.
calamity 2016/05/02 21:31:12 Done.
100 </body> 74 </body>
101 75
102 </html> 76 </html>
OLDNEW
« chrome/browser/resources/md_history/app.js ('K') | « chrome/browser/resources/md_history/elements.html ('k') | chrome/browser/resources/md_history/history.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698