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

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

Issue 1899043003: MD Downloads/History: unify page and toolbar background colors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: the colors, duke, the colors! Created 4 years, 8 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{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 9
9 <style> 10 <style>
10 html, 11 html,
11 body { 12 body {
12 height: 100%; 13 height: 100%;
13 margin: 0; 14 margin: 0;
14 } 15 }
15 16
16 body { 17 body {
17 background: #f2f2f2; 18 background: var(--md-background-color);
18 display: flex; 19 display: flex;
19 flex-direction: column; 20 flex-direction: column;
20 min-width: 800px; 21 min-width: 800px;
21 } 22 }
22 23
23 #toolbar { 24 #toolbar {
24 flex: 0 0 56px; 25 flex: 0 0 56px;
25 } 26 }
26 27
27 #history-list { 28 #history-list {
(...skipping 19 matching lines...) Expand all
47 } 48 }
48 49
49 .loading .app-shim { 50 .loading .app-shim {
50 display: flex; 51 display: flex;
51 font-size: 123%; 52 font-size: 123%;
52 } 53 }
53 54
54 .loading #loading-toolbar { 55 .loading #loading-toolbar {
55 -webkit-padding-start: 24px; 56 -webkit-padding-start: 24px;
56 align-items: center; 57 align-items: center;
57 background: rgb(63, 85, 102);
58 color: #fff; 58 color: #fff;
59 flex-direction: row; 59 flex-direction: row;
60 font-weight: 400; 60 font-weight: 400;
61 height: 56px; 61 height: 56px;
62 } 62 }
63 63
64 #toolbar,
65 .loading #loading-toolbar {
66 background: var(--md-toolbar-color);
67 }
68
64 .loading #loading-message { 69 .loading #loading-message {
65 align-items: center; 70 align-items: center;
66 color: #b4b4b4; 71 color: #b4b4b4;
67 flex: 1; 72 flex: 1;
68 font-weight: 500; 73 font-weight: 500;
69 justify-content: center; 74 justify-content: center;
70 } 75 }
71 </style> 76 </style>
72 </head> 77 </head>
73 78
74 <body class="loading"> 79 <body class="loading">
75 <history-toolbar class="paper-header" id="toolbar"></history-toolbar> 80 <history-toolbar class="paper-header" id="toolbar"></history-toolbar>
81
76 <div id="main-container"> 82 <div id="main-container">
77 <history-side-bar id="history-side-bar"></history-side-bar> 83 <history-side-bar id="history-side-bar"></history-side-bar>
78 <history-list id="history-list"></history-list> 84 <history-list id="history-list"></history-list>
79 <history-synced-device-manager id="history-synced-device-manager" hidden> 85 <history-synced-device-manager id="history-synced-device-manager" hidden>
80 </history-synced-device-manager> 86 </history-synced-device-manager>
81 </div> 87 </div>
82 88
83 <span class="app-shim" id="loading-toolbar">$i18n{title}</span> 89 <span class="app-shim" id="loading-toolbar">$i18n{title}</span>
84 <span class="app-shim" id="loading-message">$i18n{loading}</span> 90 <span class="app-shim" id="loading-message">$i18n{loading}</span>
85 91
86 <link rel="import" href="chrome://resources/html/cr.html"> 92 <link rel="import" href="chrome://resources/html/cr.html">
87 <link rel="import" href="chrome://resources/html/util.html"> 93 <link rel="import" href="chrome://resources/html/util.html">
88 <link rel="import" href="chrome://resources/html/load_time_data.html"> 94 <link rel="import" href="chrome://resources/html/load_time_data.html">
89 <link rel="import" href="chrome://history/constants.html"> 95 <link rel="import" href="chrome://history/constants.html">
90 <script src="strings.js"></script> 96 <script src="strings.js"></script>
91 <script src="history.js"></script> 97 <script src="history.js"></script>
92 98
93 <link rel="import" href="chrome://history/elements.html" async id="bundle"> 99 <link rel="import" href="chrome://history/elements.html" async id="bundle">
94 100
95 <!-- 101 <!--
96 Prepare strings and perform i18n substitutions. 102 Prepare strings and perform i18n substitutions.
97 TODO(tsergeant): Remove once we are fully converted to 103 TODO(tsergeant): Remove once we are fully converted to
98 ReplaceTemplateExpressions. It is currently only used for the <html> tag. 104 ReplaceTemplateExpressions. It is currently only used for the <html> tag.
99 --> 105 -->
100 <link rel="import" href="chrome://resources/html/i18n_template.html" async> 106 <link rel="import" href="chrome://resources/html/i18n_template.html" async>
101 </body> 107 </body>
102 108
103 </html> 109 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_downloads/vulcanized.html ('k') | chrome/browser/resources/md_history/history_toolbar.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698