From 7290650a08676b9675d368dd5d3a3493c2d4d8df Mon Sep 17 00:00:00 2001 From: Rodrigo Fernandes Date: Sat, 10 Sep 2016 14:57:26 +0100 Subject: [PATCH] Fix line height not matching between right and left side --- bower.json | 2 +- package.json | 2 +- src/ui/css/diff2html.css | 26 ++++++++------------------ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/bower.json b/bower.json index 72c8ba5..afd48f2 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "diff2html", - "version": "2.0.4", + "version": "2.0.5", "homepage": "https://diff2html.xyz", "description": "Fast Diff to colorized HTML", "keywords": [ diff --git a/package.json b/package.json index 36c275d..e0c10e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "diff2html", - "version": "2.0.4", + "version": "2.0.5", "homepage": "https://diff2html.xyz", "description": "Fast Diff to colorized HTML", "keywords": [ diff --git a/src/ui/css/diff2html.css b/src/ui/css/diff2html.css index 48b345e..b5e160b 100644 --- a/src/ui/css/diff2html.css +++ b/src/ui/css/diff2html.css @@ -52,14 +52,13 @@ width: 100%; font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 15px; - line-height: 15px; } .d2h-file-name { - line-height: 33px; white-space: nowrap; text-overflow: ellipsis; - overflow: hidden; + overflow-x: hidden; + line-height: 21px; } .d2h-file-wrapper { @@ -75,13 +74,15 @@ font-size: 13px; } -.d2h-diff-tbody > tr > td > div { - height: 16px; - line-height: 16px; +.d2h-diff-tbody > tr > td { + height: 20px; + line-height: 20px; } .d2h-files-diff { + display: block; width: 100%; + height: 100%; } .d2h-file-diff { @@ -95,6 +96,7 @@ overflow-y: hidden; width: 50%; margin-right: -4px; + margin-bottom: -8px; } .d2h-code-line { @@ -102,16 +104,12 @@ white-space: nowrap; padding: 0 10px; margin-left: 80px; - height: 20px; - line-height: 20px; } .d2h-code-side-line { display: inline-block; white-space: nowrap; padding: 0 10px; - height: 20px; - line-height: 20px; margin-left: 50px; } @@ -172,10 +170,8 @@ box-sizing: border-box; position: absolute; width: 86px; - height: 18px; padding-left: 2px; padding-right: 2px; - line-height: 18px; background-color: #fff; color: rgba(0, 0, 0, 0.3); text-align: right; @@ -190,8 +186,6 @@ width: 56px; padding-left: 5px; padding-right: 5px; - height: 18px; - line-height: 18px; background-color: #fff; color: rgba(0, 0, 0, 0.3); text-align: right; @@ -262,10 +256,6 @@ text-align: left; } -.d2h-file-list-line .d2h-file-name { - line-height: 21px; -} - .d2h-file-list { display: block; list-style: none;