Skip to content

Commit dbd8766

Browse files
committed
Release version 2.0.0-rc.5
1 parent 0e5c6cd commit dbd8766

File tree

6 files changed

+241
-153
lines changed

6 files changed

+241
-153
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "diff2html",
3-
"version": "2.0.0-rc.4",
3+
"version": "2.0.0-rc.5",
44
"homepage": "http://rtfpessoa.github.io/diff2html/",
55
"description": "Fast Diff to colorized HTML",
66
"keywords": [

dist/diff2html.css

Lines changed: 77 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,37 @@
1616
}
1717

1818
.d2h-file-stats {
19-
display: inline;
20-
text-align: center;
19+
display: flex;
20+
margin-left: auto;
21+
font-size: 14px;
2122
}
2223

2324
.d2h-lines-added {
2425
text-align: right;
25-
}
26-
27-
.d2h-lines-added > * {
28-
background-color: #ceffce;
2926
border: 1px solid #b4e2b4;
30-
color: #399839;
3127
border-radius: 5px 0 0 5px;
28+
color: #399839;
3229
padding: 2px;
30+
vertical-align: middle;
3331
}
3432

3533
.d2h-lines-deleted {
3634
text-align: left;
37-
}
38-
39-
.d2h-lines-deleted > * {
40-
background-color: #f7c8c8;
4135
border: 1px solid #e9aeae;
42-
color: #c33;
4336
border-radius: 0 5px 5px 0;
37+
color: #c33;
4438
padding: 2px;
39+
vertical-align: middle;
40+
margin-left: 1px;
4541
}
4642

4743
.d2h-file-name-wrapper {
48-
display: inline-flex;
49-
width: 90%;
44+
display: flex;
45+
align-items: center;
46+
width: 100%;
5047
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
5148
font-size: 15px;
49+
line-height: 15px;
5250
}
5351

5452
.d2h-file-name {
@@ -102,16 +100,11 @@
102100

103101
.d2h-code-side-line {
104102
display: block;
105-
white-space: pre;
103+
white-space: nowrap;
106104
padding: 0 10px;
107105
height: 18px;
108106
line-height: 18px;
109107
margin-left: 50px;
110-
/* Override HighlightJS */
111-
/*color: inherit;*/
112-
/*overflow-x: inherit;*/
113-
/*background: none;*/
114-
/* ******************** */
115108
}
116109

117110
.d2h-code-line del,
@@ -249,6 +242,7 @@
249242
}
250243

251244
.d2h-file-list-line {
245+
display: flex;
252246
text-align: left;
253247
}
254248

@@ -258,6 +252,19 @@
258252

259253
.d2h-file-list {
260254
display: block;
255+
list-style: none;
256+
padding: 0;
257+
margin: 0;
258+
}
259+
260+
.d2h-file-list > li {
261+
border-bottom: #ddd solid 1px;
262+
padding: 5px 10px;
263+
margin: 0;
264+
}
265+
266+
.d2h-file-list > li:last-child {
267+
border-bottom: none;
261268
}
262269

263270
.d2h-file-switch {
@@ -266,6 +273,56 @@
266273
cursor: pointer;
267274
}
268275

276+
.d2h-icon-wrapper {
277+
line-height: 31px;
278+
}
279+
280+
.d2h-icon {
281+
vertical-align: middle;
282+
margin-right: 10px;
283+
fill: currentColor;
284+
}
285+
286+
.d2h-deleted {
287+
color: #c33;
288+
}
289+
290+
.d2h-added {
291+
color: #399839;
292+
}
293+
294+
.d2h-changed {
295+
color: #d0b44c;
296+
}
297+
298+
.d2h-moved {
299+
color: #3572b0;
300+
}
301+
302+
.d2h-tag {
303+
display: flex;
304+
font-size: 10px;
305+
margin-left: 5px;
306+
padding: 0 2px;
307+
background-color: #fff;
308+
}
309+
310+
.d2h-deleted-tag {
311+
border: #c33 1px solid;
312+
}
313+
314+
.d2h-added-tag {
315+
border: #399839 1px solid;
316+
}
317+
318+
.d2h-changed-tag {
319+
border: #d0b44c 1px solid;
320+
}
321+
322+
.d2h-moved-tag {
323+
border: #3572b0 1px solid;
324+
}
325+
269326
/*
270327
* Selection util.
271328
*/

0 commit comments

Comments
 (0)