chrome/browser/resources/md_history/history.html - Issue 1899043003: MD Downloads/History: unify page and toolbar background colors

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: merge 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

« no previous file with comments | « chrome/browser/resources/md_downloads/vulcanized.html ('k') | chrome/browser/resources/md_history/history_toolbar.html » ('j') | chrome/browser/resources/md_history/history_toolbar.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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="import" href="chrome://resources/html/md_shared_styles.html">

8	9

9 <style>	10 <style is="custom-style" include="md-shared-styles">
	tsergeant 2016/04/20 06:29:40 This adds a brief flash of white background (about This adds a brief flash of white background (about 100ms on my machine), since the background can't be set until polymer is ready. I'm happy to ignore this for now and work around it later. I'm planning on vulcanizing the page, which seems improve the flash (as well as improve page load time overall). Dan Beam 2016/04/21 01:42:35 Let's just native props and drop the custom-style Show quoted text On 2016/04/20 06:29:40, tsergeant wrote: > This adds a brief flash of white background (about 100ms on my machine), since > the background can't be set until polymer is ready. > > I'm happy to ignore this for now and work around it later. I'm planning on > vulcanizing the page, which seems improve the flash (as well as improve page > load time overall). Let's just native props and drop the custom-style for now. <3 chrome-only dev
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 Loading...
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 background: rgb(63, 85, 102);
	tsergeant 2016/04/20 06:29:40 This should be updated to var(--md-toolbar-color) This should be updated to var(--md-toolbar-color) too. Dan Beam 2016/04/21 01:42:35 Done. Show quoted text On 2016/04/20 06:29:40, tsergeant wrote: > This should be updated to var(--md-toolbar-color) too. Done.
58 color: #fff;	59 color: #fff;

59 flex-direction: row;	60 flex-direction: row;

60 font-weight: 400;	61 font-weight: 400;

61 height: 56px;	62 height: 56px;

62 }	63 }

63	64

64 .loading #loading-message {	65 .loading #loading-message {

65 align-items: center;	66 align-items: center;

66 color: #b4b4b4;	67 color: #b4b4b4;
	dschuyler 2016/04/20 20:44:46 Does it make sense to change this as well in this Does it make sense to change this as well in this CL? Maybe --paper-grey-400 or a custom color variable. Dan Beam 2016/04/21 01:42:35 IMO, no Show quoted text On 2016/04/20 20:44:46, dschuyler wrote: > Does it make sense to change this as well > in this CL? Maybe --paper-grey-400 or > a custom color variable. IMO, no
67 flex: 1;	68 flex: 1;

68 font-weight: 500;	69 font-weight: 500;

69 justify-content: center;	70 justify-content: center;

70 }	71 }

71 </style>	72 </style>

72 </head>	73 </head>

73	74

74 <body class="loading">	75 <body class="loading">

75 <history-toolbar class="paper-header" id="toolbar"></history-toolbar>	76 <history-toolbar class="paper-header" id="toolbar"></history-toolbar>

76 <div id="main-container">	77 <div id="main-container">

(...skipping 17 matching lines...) Expand all Loading...
94	95

95 <!--	96 <!--

96 Prepare strings and perform i18n substitutions.	97 Prepare strings and perform i18n substitutions.

97 TODO(tsergeant): Remove once we are fully converted to	98 TODO(tsergeant): Remove once we are fully converted to

98 ReplaceTemplateExpressions. It is currently only used for the <html> tag.	99 ReplaceTemplateExpressions. It is currently only used for the <html> tag.

99 -->	100 -->

100 <link rel="import" href="chrome://resources/html/i18n_template.html" async>	101 <link rel="import" href="chrome://resources/html/i18n_template.html" async>

101 </body>	102 </body>

102	103

103 </html>	104 </html>

OLD	NEW