Skip to content

Commit 7eba340

Browse files
committed
Fix colors
* Some background colors made did not match between the two versions. * Some foreground colors blended into the background color. * Color styles added for HTML Merged Renderer.
1 parent 9830fe0 commit 7eba340

File tree

2 files changed

+42
-26
lines changed

2 files changed

+42
-26
lines changed

example/dark-theme.css

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ body {
66
}
77

88
pre {
9-
width: 100%;
109
overflow: auto;
10+
width: 100%;
1111
}
1212

1313
a, a:visited {
@@ -19,35 +19,35 @@ a, a:visited {
1919
*/
2020

2121
.Differences {
22-
width: 100%;
2322
border-collapse: collapse;
2423
border-spacing: 0;
2524
empty-cells: show;
25+
width: 100%;
2626
}
2727

2828
.Differences thead th {
29-
text-align: left;
30-
border-bottom: 1px solid #000000;
3129
background: #AAAAAA;
30+
border-bottom: 1px solid #000000;
3231
color: #000000;
3332
padding: 4px;
33+
text-align: left;
3434
}
3535

3636
.Differences tbody th {
37-
text-align: right;
3837
background: #AAAAAA;
38+
border-right: 1px solid #000000;
3939
color: #272822;
40-
width: 4em;
40+
font-size: 13px;
4141
padding: 1px 2px;
42-
border-right: 1px solid #000000;
42+
text-align: right;
4343
vertical-align: top;
44-
font-size: 13px;
44+
width: 4em;
4545
}
4646

4747
.Differences td {
48-
padding: 1px 2px;
4948
font-family: Consolas, monospace;
5049
font-size: 13px;
50+
padding: 1px 2px;
5151
}
5252

5353
.Differences .Skipped {
@@ -65,7 +65,7 @@ a, a:visited {
6565
* HTML Side by Side Diff
6666
*/
6767
.DifferencesSideBySide .ChangeInsert td.Left {
68-
background: #008000;
68+
background: #DDFFDD;
6969
}
7070

7171
.DifferencesSideBySide .ChangeInsert td.Right {
@@ -83,7 +83,7 @@ a, a:visited {
8383
}
8484

8585
.DifferencesSideBySide .ChangeReplace .Left {
86-
background: #FFEE99;
86+
background: #FFDD88;
8787
color: #272822;
8888
}
8989

@@ -114,10 +114,12 @@ a, a:visited {
114114
.DifferencesUnified .ChangeReplace .Right,
115115
.DifferencesUnified .ChangeInsert .Right {
116116
background: #DDFFDD;
117+
color: #272822;
117118
}
118119

119120
.DifferencesUnified .ChangeReplace ins {
120121
background: #008000;
122+
color: #272822;
121123
}
122124

123125
.DifferencesUnified .ChangeReplace del {
@@ -128,13 +130,16 @@ a, a:visited {
128130
/*
129131
* HTML Merged Diff
130132
*/
131-
.DifferencesMerged .ChangeReplace .Left,
133+
.DifferencesMerged td.ChangeInsert {
134+
background: #FFDD88;
135+
color: #272822;
136+
}
137+
132138
.DifferencesMerged .ChangeDelete {
133139
background: #FFDDDD;
134140
color: #272822;
135141
}
136142

137-
.DifferencesMerged .ChangeReplace .Right,
138143
.DifferencesMerged .ChangeInsert {
139144
background: #DDFFDD;
140145
color: #272822;
@@ -153,3 +158,7 @@ a, a:visited {
153158
.DifferencesMerged th.ChangeDelete {
154159
background-image: linear-gradient(-45deg, #AAAAAA 0%, #EE9999 100%);
155160
}
161+
162+
.DifferencesMerged th.ChangeReplace {
163+
background-image: linear-gradient(-45deg, #CCCCCC 0%, #FFDD88 100%);
164+
}

example/styles.css

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,44 @@ body {
66
}
77

88
pre {
9-
width: 100%;
109
overflow: auto;
10+
width: 100%;
1111
}
1212

1313
/*
1414
* HTML Renderers - General
1515
*/
1616

1717
.Differences {
18-
width: 100%;
1918
border-collapse: collapse;
2019
border-spacing: 0;
2120
empty-cells: show;
21+
width: 100%;
2222
}
2323

2424
.Differences thead th {
25-
text-align: left;
26-
border-bottom: 1px solid #000000;
2725
background: #AAAAAA;
26+
border-bottom: 1px solid #000000;
2827
color: #000000;
2928
padding: 4px;
29+
text-align: left;
3030
}
3131

3232
.Differences tbody th {
33-
text-align: right;
3433
background: #CCCCCC;
35-
width: 4em;
36-
padding: 1px 2px;
3734
border-right: 1px solid #000000;
38-
vertical-align: top;
3935
font-size: 13px;
36+
padding: 1px 2px;
37+
text-align: right;
38+
vertical-align: top;
39+
width: 4em;
4040
}
4141

4242
.Differences td {
43-
padding: 1px 2px;
44-
font-family: Consolas, monospace;
45-
font-size: 13px;
43+
font-family: Consolas, monospace;
44+
font-size: 13px;
45+
padding: 1px 2px;
46+
vertical-align: top;
4647
}
4748

4849
.Differences .Skipped {
@@ -111,12 +112,14 @@ pre {
111112
/*
112113
* HTML Merged Diff
113114
*/
114-
.DifferencesMerged .ChangeReplace .Left,
115+
.DifferencesMerged td.ChangeInsert {
116+
background: #FFDD88;
117+
}
118+
115119
.DifferencesMerged .ChangeDelete {
116120
background: #FFDDDD;
117121
}
118122

119-
.DifferencesMerged .ChangeReplace .Right,
120123
.DifferencesMerged .ChangeInsert {
121124
background: #DDFFDD;
122125
}
@@ -132,3 +135,7 @@ pre {
132135
.DifferencesMerged th.ChangeDelete {
133136
background-image: linear-gradient(-45deg, #CCCCCC 0%, #EE9999 100%);
134137
}
138+
139+
.DifferencesMerged th.ChangeReplace {
140+
background-image: linear-gradient(-45deg, #CCCCCC 0%, #FFDD88 100%);
141+
}

0 commit comments

Comments
 (0)