luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix line height not matching between right and left side

Browse source
This commit is contained in:
Rodrigo Fernandes 2016-09-10 14:57:26 +01:00
parent 0b3c3986c5
commit 7290650a08
No known key found for this signature in database
GPG key ID: 08E3C5F38969078E
3 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bower.json
View file

@ -1,6 +1,6 @@
{ {
"name": "diff2html", "name": "diff2html",
"version": "2.0.4", "version": "2.0.5",
"homepage": "https://diff2html.xyz", "homepage": "https://diff2html.xyz",
"description": "Fast Diff to colorized HTML", "description": "Fast Diff to colorized HTML",
"keywords": [ "keywords": [

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "diff2html", "name": "diff2html",
"version": "2.0.4", "version": "2.0.5",
"homepage": "https://diff2html.xyz", "homepage": "https://diff2html.xyz",
"description": "Fast Diff to colorized HTML", "description": "Fast Diff to colorized HTML",
"keywords": [ "keywords": [

26
src/ui/css/diff2html.css
View file

@ -52,14 +52,13 @@
width: 100%; width: 100%;
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 15px; font-size: 15px;
line-height: 15px;
} }
.d2h-file-name { .d2h-file-name {
line-height: 33px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow-x: hidden;
line-height: 21px;
} }
.d2h-file-wrapper { .d2h-file-wrapper {
@ -75,13 +74,15 @@
font-size: 13px; font-size: 13px;
} }
.d2h-diff-tbody > tr > td > div { .d2h-diff-tbody > tr > td {
height: 16px; height: 20px;
line-height: 16px; line-height: 20px;
} }
.d2h-files-diff { .d2h-files-diff {
display: block;
width: 100%; width: 100%;
height: 100%;
} }
.d2h-file-diff { .d2h-file-diff {
@ -95,6 +96,7 @@
overflow-y: hidden; overflow-y: hidden;
width: 50%; width: 50%;
margin-right: -4px; margin-right: -4px;
margin-bottom: -8px;
} }
.d2h-code-line { .d2h-code-line {
@ -102,16 +104,12 @@
white-space: nowrap; white-space: nowrap;
padding: 0 10px; padding: 0 10px;
margin-left: 80px; margin-left: 80px;
height: 20px;
line-height: 20px;
} }
.d2h-code-side-line { .d2h-code-side-line {
display: inline-block; display: inline-block;
white-space: nowrap; white-space: nowrap;
padding: 0 10px; padding: 0 10px;
height: 20px;
line-height: 20px;
margin-left: 50px; margin-left: 50px;
} }
@ -172,10 +170,8 @@
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
width: 86px; width: 86px;
height: 18px;
padding-left: 2px; padding-left: 2px;
padding-right: 2px; padding-right: 2px;
line-height: 18px;
background-color: #fff; background-color: #fff;
color: rgba(0, 0, 0, 0.3); color: rgba(0, 0, 0, 0.3);
text-align: right; text-align: right;
@ -190,8 +186,6 @@
width: 56px; width: 56px;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
height: 18px;
line-height: 18px;
background-color: #fff; background-color: #fff;
color: rgba(0, 0, 0, 0.3); color: rgba(0, 0, 0, 0.3);
text-align: right; text-align: right;
@ -262,10 +256,6 @@
text-align: left; text-align: left;
} }
.d2h-file-list-line .d2h-file-name {
line-height: 21px;
}
.d2h-file-list { .d2h-file-list {
display: block; display: block;
list-style: none; list-style: none;