8000 Fix line height not matching between right and left side · hubgit/diff2html@7290650 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7290650

Browse files
rtfpessoartfpessoa
committed
Fix line height not matching between right and left side
1 parent 0b3c398 commit 7290650

File tree

3 files changed

+10
-20
lines changed

3 files changed

+10
-20
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.4",
3+
"version": "2.0.5",
44
"homepage": "https://diff2html.xyz",
55
"description": "Fast Diff to colorized HTML",
66
"keywords": [

‎package.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.4",
3+
"version": "2.0.5",
44
"homepage": "https://diff2html.xyz",
55
"description": "Fast Diff to colorized HTML",
66
"keywords": [

‎src/ui/css/diff2html.css

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,13 @@
5252
width: 100%;
5353
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
5454
font-size: 15px;
55-
line-height: 15px;
5655
}
5756

5857
.d2h-file-name {
59-
line-height: 33px;
6058
white-space: nowrap;
6159
text-overflow: ellipsis;
62-
overflow: hidden;
60+
overflow-x: hidden;
61+
line-height: 21px;
6362
}
6463

6564
.d2h-file-wrapper {
@@ -75,13 +74,15 @@
7574
font-size: 13px;
7675
}
7776

78-
.d2h-diff-tbody > tr > td > div {
79-
height: 16px;
80-
line-height: 16px;
77+
.d2h-diff-tbody > tr > td {
78+
height: 20px;
79+
line-height: 20px;
8180
}
8281

8382
.d2h-files-diff {
83+
display: block;
8484
width: 100%;
85+
height: 100%;
8586
}
8687

8788
.d2h-file-diff {
@@ -95,23 +96,20 @@
9596
overflow-y: hidden;
9697
width: 50%;
9798
margin-right: -4px;
99+
margin-bottom: -8px;
98100
}
99101

100102
.d2h-code-line {
101103
display: inline-block;
102104
white-space: nowrap;
103105
padding: 0 10px;
104106
margin-left: 80px;
105-
height: 20px;
106-
line-height: 20px;
107107
}
108108

109109
.d2h-code-side-line {
110110
display: inline-block;
111111
white-space: nowrap;
112112
padding: 0 10px;
113-
height: 20px;
114-
line-height: 20px;
115113
margin-left: 50px;
116114
}
117115

@@ -172,10 +170,8 @@
172170
box-sizing: border-box;
173171
position: absolute;
174172
width: 86px;
175-
height: 18px;
176173
padding-left: 2px;
177174
padding-right: 2px;
178-
line-height: 18px;
179175
background-color: #fff;
180176
color: rgba(0, 0, 0, 0.3);
181177
text-align: right;
@@ -190,8 +186,6 @@
190186
width: 56px;
191187
padding-left: 5px;
192188
padding-right: 5px;
193-
height: 18px;
194-
line-height: 18px;
195189
background-color: #fff;
196190
color: rgba(0, 0, 0, 0.3);
197191
text-align: right;
@@ -262,10 +256,6 @@
262256
text-align: left;
263257
}
264258

265-
.d2h-file-list-line .d2h-file-name {
266-
line-height: 21px;
267-
}
268-
269259
.d2h-file-list {
270260
display: block;
271261
list-style: none;

0 commit comments

Comments
 (0)
0