Skip to content

Commit 9be7263

Browse files
committed
css fix to Y scrollbar and update to highlightjs 8.6
1 parent 494e222 commit 9be7263

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

dist/diff2html.css

+14-1
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,18 @@
7575

7676
.d2h-file-diff {
7777
overflow-x: scroll;
78+
overflow-y: hidden;
7879
}
7980

8081
.d2h-file-side-diff {
8182
display: inline-block;
8283
overflow-x: scroll;
84+
overflow-y: hidden;
8385
width: 50%;
8486
margin-right: -4px;
8587
}
8688

87-
.d2h-code-line.hljs {
89+
.d2h-code-line {
8890
display: block;
8991
white-space: pre;
9092
padding: 0 10px;
@@ -130,6 +132,17 @@
130132
border-radius: 0.2em;
131133
}
132134

135+
.d2h-code-line-prefix {
136+
float: left;
137+
background: none;
138+
padding: 0;
139+
}
140+
141+
.d2h-code-line-ctn {
142+
background: none;
143+
padding: 0;
144+
}
145+
133146
.line-num1 {
134147
display: inline-block;
135148
float: left;

dist/template.html

+8-13
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,26 @@
99
Author: rtfpessoa
1010
-->
1111

12-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/github.min.css">
12+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/github.min.css">
1313
<link rel="stylesheet" type="text/css" href="{{css}}">
1414

1515
<script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
16-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"></script>
17-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/languages/scala.min.js"></script>
16+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js"></script>
17+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/languages/scala.min.js"></script>
1818
<script>
1919
$(document).ready(function () {
20-
var languages = $(".d2h-file-wrapper").map(function (i, file) {
20+
var allFileLanguages = $(".d2h-file-wrapper").map(function (i, file) {
2121
return $(file).data("lang");
2222
});
23-
var uniqueLanguages = languages.filter(function (i, v) {
24-
return $.inArray(v, languages) == i;
23+
var distinctLanguages = allFileLanguages.filter(function (i, v) {
24+
return $.inArray(v, allFileLanguages) == i;
2525
});
26-
hljs.configure({languages: uniqueLanguages.toArray()});
26+
hljs.configure({languages: distinctLanguages.toArray()});
2727

28-
var code = $(".d2h-code-line");
28+
var code = $(".d2h-code-line-ctn");
2929
code.map(function (i, line) {
3030
hljs.highlightBlock(line);
3131
});
32-
33-
var codeSide = $(".d2h-code-side-line");
34-
codeSide.map(function (i, line) {
35-
hljs.highlightBlock(line);
36-
});
3732
});
3833
</script>
3934
</head>

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "diff2html-cli",
3-
"version": "0.2.3",
3+
"version": "0.2.4",
44

55
"homepage": "https://www.github.com/rtfpessoa/diff2html-nodejs-cli",
66
"description": "Fast Diff to colorized HTML",
@@ -53,8 +53,8 @@
5353
"main": "./src/main.js",
5454

5555
"dependencies": {
56-
"commander": "2.7.1",
57-
"extend": "2.0.0",
56+
"commander": "2.8.1",
57+
"extend": "3.0.0",
5858
"pkginfo": "0.3.0",
5959
"diff2html": "*"
6060
},

0 commit comments

Comments
 (0)