Skip to content

Commit 8954ed5

Browse files
JBlondJBlond
committed
Merge branch 'master' into php-diff-82
# Conflicts: # example/dark-theme.css # example/styles.css # lib/jblond/Diff/Renderer/Html/Merged.php
2 parents 2d05831 + c09edb2 commit 8954ed5

24 files changed

+151
-127
lines changed

‎changelog.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
# Changelog
22

3-
## 2.3.1 (2021-02-03)
3+
## 2.3.2 (2021-03-27)
4+
5+
* Bump library version ([6e42d96](https://github.com/JBlond/php-diff/commit/6e42d96))
6+
* Fix [#90](https://github.com/JBlond/php-diff/issues/90) - Merged Diff shows result only partially ([acbfd7d](https://github.com/JBlond/php-diff/commit/acbfd7d))
7+
* Fix colors ([7eba340](https://github.com/JBlond/php-diff/commit/7eba340))
8+
* Fix repeating class assignment of line header ([fb32453](https://github.com/JBlond/php-diff/commit/fb32453))
9+
* Fix title attribute values ([533a6bf](https://github.com/JBlond/php-diff/commit/533a6bf))
10+
11+
## v2.3.1 (2021-02-03)
412

513
* Add DigiLive/gitChangelog for change log generation ([0a6a84f](https://github.com/JBlond/php-diff/commit/0a6a84f))
614
* Bump library version ([013f862](https://github.com/JBlond/php-diff/commit/013f862))
715
* Cut HTML Unified Renderer ([1ba255f](https://github.com/JBlond/php-diff/commit/1ba255f))
816
* Document PhpUnit Similarity Test ([7ec484c](https://github.com/JBlond/php-diff/commit/7ec484c))
9-
* Document Update Changelog ([7d6c8bb](https://github.com/JBlond/php-diff/commit/7d6c8bb), [c9881d3](https://github.com/JBlond/php-diff/commit/c9881d3))
17+
* Document Update Changelog ([28e1dc0](https://github.com/JBlond/php-diff/commit/28e1dc0), [c9881d3](https://github.com/JBlond/php-diff/commit/c9881d3))
1018
* Document disabled inspection ([909e195](https://github.com/JBlond/php-diff/commit/909e195))
1119
* Document generateLinesEqual() ([8a193c9](https://github.com/JBlond/php-diff/commit/8a193c9))
1220
* Document methods ([94c8bd5](https://github.com/JBlond/php-diff/commit/94c8bd5))

‎example/dark-theme.css

Lines changed: 20 additions & 15 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

@@ -127,10 +127,12 @@ a, a:visited {
127127
.DifferencesUnified .ChangeReplace .Right,
128128
.DifferencesUnified .ChangeInsert .Right {
129129
background: #DDFFDD;
130+
color: #272822;
130131
}
131132

132133
.DifferencesUnified .ChangeReplace ins {
133134
background: #008000;
135+
color: #272822;
134136
}
135137

136138
.DifferencesUnified .ChangeReplace del {
@@ -154,13 +156,16 @@ a, a:visited {
154156
/*
155157
* HTML Merged Diff
156158
*/
157-
.DifferencesMerged .ChangeReplace .Left,
159+
.DifferencesMerged td.ChangeReplace {
160+
background: #FFDD88;
161+
color: #272822;
162+
}
163+
158164
.DifferencesMerged .ChangeDelete {
159165
background: #FFDDDD;
160166
color: #272822;
161167
}
162168

163-
.DifferencesMerged .ChangeReplace .Right,
164169
.DifferencesMerged .ChangeInsert {
165170
background: #DDFFDD;
166171
color: #272822;
@@ -180,6 +185,6 @@ a, a:visited {
180185
background-image: linear-gradient(-45deg, #AAAAAA 0%, #EE9999 100%);
181186
}
182187

183-
.DifferencesMerged th.ChangeIgnore {
184-
background-image: linear-gradient(-45deg, #CCCCCC 0%, #4B4C57 100%);
188+
.DifferencesMerged th.ChangeReplace {
189+
background-image: linear-gradient(-45deg, #CCCCCC 0%, #FFDD88 100%);
185190
}

‎example/styles.css

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ pre {
4040
}
4141

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

4849
.Differences .Skipped {
@@ -137,12 +138,14 @@ pre {
137138
/*
138139
* HTML Merged Diff
139140
*/
140-
.DifferencesMerged .ChangeReplace .Left,
141+
.DifferencesMerged td.ChangeReplace {
142+
background: #FFDD88;
143+
}
144+
141145
.DifferencesMerged .ChangeDelete {
142146
background: #FFDDDD;
143147
}
144148

145-
.DifferencesMerged .ChangeReplace .Right,
146149
.DifferencesMerged .ChangeInsert {
147150
background: #DDFFDD;
148151
}
@@ -159,6 +162,6 @@ pre {
159162
background-image: linear-gradient(-45deg, #CCCCCC 0%, #EE9999 100%);
160163
}
161164

162-
.DifferencesMerged th.ChangeIgnore {
163-
background-image: linear-gradient(-45deg, #CCCCCC 0%, #F7F7F7 100%);
165+
.DifferencesMerged th.ChangeReplace {
166+
background-image: linear-gradient(-45deg, #CCCCCC 0%, #FFDD88 100%);
164167
}

‎generateChangelog.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
require 'vendor/autoload.php';
66

77
$changelogOptions = [
8-
'headTagName' => '2.3.1',
9-
'headTagDate' => '2021-02-03',
8+
'headTagName' => '2.3.2',
9+
'headTagDate' => '2021-03-27',
1010
'titleOrder' => 'ASC',
1111
];
1212
$changelogLabels = ['Add', 'Cut', 'Fix', 'Bump', 'Document','Optimize'];

‎lib/jblond/Diff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @author Ferry Cools <[email protected]>
2525
* @copyright (c) 2020 Mario Brandt
2626
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
27-
* @version 2.3.0
27+
* @version 2.3.2
2828
* @link https://github.com/JBlond/php-diff
2929
*/
3030
class Diff implements ConstantsInterface

‎lib/jblond/Diff/DiffUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* @author Mario Brandt <[email protected]>
1212
* @copyright (c) 2020 Mario Brandt
1313
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
14-
* @version 2.3.0
14+
* @version 2.3.2
1515
* @link https://github.com/JBlond/php-diff
1616
*/
1717
class DiffUtils

0 commit comments

Comments
 (0)