From 011e06d876922a10c79cac3560d4a90f55ccefdb Mon Sep 17 00:00:00 2001 From: Rodrigo Fernandes Date: Sun, 20 Dec 2015 22:49:50 +0000 Subject: [PATCH] Remove conflicting CSS --- css/diff2html.css | 30 ++++++++++++++---------------- dist/diff2html.css | 30 ++++++++++++++---------------- dist/diff2html.min.css | 2 +- 3 files changed, 29 insertions(+), 33 deletions(-) diff --git a/css/diff2html.css b/css/diff2html.css index 7a69479..3c4ad52 100644 --- a/css/diff2html.css +++ b/css/diff2html.css @@ -42,7 +42,6 @@ color: #399839; border-radius: 5px 0 0 5px; padding: 2px; - width: 25px; } .d2h-lines-deleted { @@ -55,12 +54,10 @@ color: #c33; border-radius: 0 5px 5px 0; padding: 2px; - width: 25px; } .d2h-file-name { display: inline; - height: 33px; line-height: 33px; max-width: 80%; white-space: nowrap; @@ -152,7 +149,6 @@ } .line-num1 { - display: inline-block; float: left; width: 30px; overflow: hidden; @@ -160,7 +156,6 @@ } .line-num2 { - display: inline-block; float: right; width: 30px; overflow: hidden; @@ -169,7 +164,6 @@ .d2h-code-linenumber { position: absolute; - width: 2%; min-width: 65px; padding-left: 10px; padding-right: 10px; @@ -232,10 +226,7 @@ .d2h-file-list-header { font-weight: bold; - margin-bottom: 5px; - text-align: left; - display: inline; - float:left; + float: left; } .d2h-file-list-line { @@ -243,28 +234,31 @@ font: 13px Helvetica, arial, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol"; } -.d2h-file-list-line .d2h-file-name { +.d2h-file-list-line .d2h-file-name { line-height: 21px; } .d2h-file-list { - display:none; + display: none; } .d2h-clear { - display:block; + display: block; clear: both; } .d2h-del.d2h-change, .d2h-ins.d2h-change { background-color: #ffc; } + ins.d2h-change, del.d2h-change { background-color: #fad771; } + .d2h-file-diff .d2h-del.d2h-change { background-color: #fae1af; } + .d2h-file-diff .d2h-ins.d2h-change { background-color: #ded; } @@ -272,17 +266,21 @@ ins.d2h-change, del.d2h-change { /* CSS only show/hide */ .d2h-show { display: none; - float:left; + float: left; } + .d2h-hide { - float:left; + float: left; } + .d2h-hide:target + .d2h-show { display: inline; } + .d2h-hide:target { display: none; } + .d2h-hide:target ~ .d2h-file-list { - display:block; + display: block; } diff --git a/dist/diff2html.css b/dist/diff2html.css index 7a69479..3c4ad52 100644 --- a/dist/diff2html.css +++ b/dist/diff2html.css @@ -42,7 +42,6 @@ color: #399839; border-radius: 5px 0 0 5px; padding: 2px; - width: 25px; } .d2h-lines-deleted { @@ -55,12 +54,10 @@ color: #c33; border-radius: 0 5px 5px 0; padding: 2px; - width: 25px; } .d2h-file-name { display: inline; - height: 33px; line-height: 33px; max-width: 80%; white-space: nowrap; @@ -152,7 +149,6 @@ } .line-num1 { - display: inline-block; float: left; width: 30px; overflow: hidden; @@ -160,7 +156,6 @@ } .line-num2 { - display: inline-block; float: right; width: 30px; overflow: hidden; @@ -169,7 +164,6 @@ .d2h-code-linenumber { position: absolute; - width: 2%; min-width: 65px; padding-left: 10px; padding-right: 10px; @@ -232,10 +226,7 @@ .d2h-file-list-header { font-weight: bold; - margin-bottom: 5px; - text-align: left; - display: inline; - float:left; + float: left; } .d2h-file-list-line { @@ -243,28 +234,31 @@ font: 13px Helvetica, arial, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol"; } -.d2h-file-list-line .d2h-file-name { +.d2h-file-list-line .d2h-file-name { line-height: 21px; } .d2h-file-list { - display:none; + display: none; } .d2h-clear { - display:block; + display: block; clear: both; } .d2h-del.d2h-change, .d2h-ins.d2h-change { background-color: #ffc; } + ins.d2h-change, del.d2h-change { background-color: #fad771; } + .d2h-file-diff .d2h-del.d2h-change { background-color: #fae1af; } + .d2h-file-diff .d2h-ins.d2h-change { background-color: #ded; } @@ -272,17 +266,21 @@ ins.d2h-change, del.d2h-change { /* CSS only show/hide */ .d2h-show { display: none; - float:left; + float: left; } + .d2h-hide { - float:left; + float: left; } + .d2h-hide:target + .d2h-show { display: inline; } + .d2h-hide:target { display: none; } + .d2h-hide:target ~ .d2h-file-list { - display:block; + display: block; } diff --git a/dist/diff2html.min.css b/dist/diff2html.min.css index 2981be9..c45a101 100644 --- a/dist/diff2html.min.css +++ b/dist/diff2html.min.css @@ -1 +1 @@ -.d2h-wrapper{display:block;margin:0 auto;text-align:left;width:100%}.d2h-file-wrapper{border:1px solid #ddd;border-radius:3px;margin-bottom:1em}.d2h-file-header{padding:5px 10px;border-bottom:1px solid #d8d8d8;background-color:#f7f7f7;font:13px Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.d2h-file-stats{display:inline;font-size:12px;text-align:center;max-width:15%}.d2h-lines-added{text-align:right}.d2h-lines-added>*{background-color:#ceffce;border:1px solid #b4e2b4;color:#399839;border-radius:5px 0 0 5px;padding:2px;width:25px}.d2h-lines-deleted{text-align:left}.d2h-lines-deleted>*{background-color:#f7c8c8;border:1px solid #e9aeae;color:#c33;border-radius:0 5px 5px 0;padding:2px;width:25px}.d2h-file-name{display:inline;height:33px;line-height:33px;max-width:80%;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.d2h-diff-table{border-collapse:collapse;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:12px;height:18px;line-height:18px;width:100%}.d2h-files-diff{width:100%}.d2h-file-diff{overflow-x:scroll;overflow-y:hidden}.d2h-file-side-diff{display:inline-block;overflow-x:scroll;overflow-y:hidden;width:50%;margin-right:-4px}.d2h-code-line{display:block;white-space:pre;padding:0 10px;height:18px;line-height:18px;margin-left:80px;color:inherit;overflow-x:inherit;background:none}.d2h-code-side-line{display:block;white-space:pre;padding:0 10px;height:18px;line-height:18px;margin-left:50px;color:inherit;overflow-x:inherit;background:none}.d2h-code-line del,.d2h-code-side-line del{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#ffb6ba;border-radius:.2em}.d2h-code-line ins,.d2h-code-side-line ins{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#97f295;border-radius:.2em}.d2h-code-line-prefix{float:left;background:none;padding:0}.d2h-code-line-ctn{background:none;padding:0}.line-num1{display:inline-block;float:left;width:30px;overflow:hidden;text-overflow:ellipsis}.line-num2{display:inline-block;float:right;width:30px;overflow:hidden;text-overflow:ellipsis}.d2h-code-linenumber{position:absolute;width:2%;min-width:65px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,0.3);text-align:right;border:solid #eeeeee;border-width:0 1px 0 1px;cursor:pointer}.d2h-code-side-linenumber{position:absolute;width:35px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,0.3);text-align:right;border:solid #eeeeee;border-width:0 1px 0 1px;cursor:pointer;overflow:hidden;text-overflow:ellipsis}.d2h-del{background-color:#fee8e9;border-color:#e9aeae}.d2h-ins{background-color:#dfd;border-color:#b4e2b4}.d2h-info{background-color:#f8fafd;color:rgba(0,0,0,0.3);border-color:#d5e4f2}.d2h-file-list-wrapper{margin-bottom:10px;padding:0 10px}.d2h-file-list-wrapper a{text-decoration:none;color:#3572b0}.d2h-file-list-wrapper a:visited{color:#3572b0}.d2h-file-list-header{font-weight:bold;margin-bottom:5px;text-align:left;display:inline;float:left}.d2h-file-list-line{text-align:left;font:13px Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.d2h-file-list-line .d2h-file-name{line-height:21px}.d2h-file-list{display:none}.d2h-clear{display:block;clear:both}.d2h-del.d2h-change,.d2h-ins.d2h-change{background-color:#ffc}ins.d2h-change,del.d2h-change{background-color:#fad771}.d2h-file-diff .d2h-del.d2h-change{background-color:#fae1af}.d2h-file-diff .d2h-ins.d2h-change{background-color:#ded}.d2h-show{display:none;float:left}.d2h-hide{float:left}.d2h-hide:target+.d2h-show{display:inline}.d2h-hide:target{display:none}.d2h-hide:target~.d2h-file-list{display:block} \ No newline at end of file +.d2h-wrapper{display:block;margin:0 auto;text-align:left;width:100%}.d2h-file-wrapper{border:1px solid #ddd;border-radius:3px;margin-bottom:1em}.d2h-file-header{padding:5px 10px;border-bottom:1px solid #d8d8d8;background-color:#f7f7f7;font:13px Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.d2h-file-stats{display:inline;font-size:12px;text-align:center;max-width:15%}.d2h-lines-added{text-align:right}.d2h-lines-added>*{background-color:#ceffce;border:1px solid #b4e2b4;color:#399839;border-radius:5px 0 0 5px;padding:2px}.d2h-lines-deleted{text-align:left}.d2h-lines-deleted>*{background-color:#f7c8c8;border:1px solid #e9aeae;color:#c33;border-radius:0 5px 5px 0;padding:2px}.d2h-file-name{display:inline;line-height:33px;max-width:80%;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.d2h-diff-table{border-collapse:collapse;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:12px;height:18px;line-height:18px;width:100%}.d2h-files-diff{width:100%}.d2h-file-diff{overflow-x:scroll;overflow-y:hidden}.d2h-file-side-diff{display:inline-block;overflow-x:scroll;overflow-y:hidden;width:50%;margin-right:-4px}.d2h-code-line{display:block;white-space:pre;padding:0 10px;height:18px;line-height:18px;margin-left:80px;color:inherit;overflow-x:inherit;background:none}.d2h-code-side-line{display:block;white-space:pre;padding:0 10px;height:18px;line-height:18px;margin-left:50px;color:inherit;overflow-x:inherit;background:none}.d2h-code-line del,.d2h-code-side-line del{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#ffb6ba;border-radius:.2em}.d2h-code-line ins,.d2h-code-side-line ins{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#97f295;border-radius:.2em}.d2h-code-line-prefix{float:left;background:none;padding:0}.d2h-code-line-ctn{background:none;padding:0}.line-num1{float:left;width:30px;overflow:hidden;text-overflow:ellipsis}.line-num2{float:right;width:30px;overflow:hidden;text-overflow:ellipsis}.d2h-code-linenumber{position:absolute;min-width:65px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,0.3);text-align:right;border:solid #eeeeee;border-width:0 1px 0 1px;cursor:pointer}.d2h-code-side-linenumber{position:absolute;width:35px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,0.3);text-align:right;border:solid #eeeeee;border-width:0 1px 0 1px;cursor:pointer;overflow:hidden;text-overflow:ellipsis}.d2h-del{background-color:#fee8e9;border-color:#e9aeae}.d2h-ins{background-color:#dfd;border-color:#b4e2b4}.d2h-info{background-color:#f8fafd;color:rgba(0,0,0,0.3);border-color:#d5e4f2}.d2h-file-list-wrapper{margin-bottom:10px;padding:0 10px}.d2h-file-list-wrapper a{text-decoration:none;color:#3572b0}.d2h-file-list-wrapper a:visited{color:#3572b0}.d2h-file-list-header{font-weight:bold;float:left}.d2h-file-list-line{text-align:left;font:13px Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.d2h-file-list-line .d2h-file-name{line-height:21px}.d2h-file-list{display:none}.d2h-clear{display:block;clear:both}.d2h-del.d2h-change,.d2h-ins.d2h-change{background-color:#ffc}ins.d2h-change,del.d2h-change{background-color:#fad771}.d2h-file-diff .d2h-del.d2h-change{background-color:#fae1af}.d2h-file-diff .d2h-ins.d2h-change{background-color:#ded}.d2h-show{display:none;float:left}.d2h-hide{float:left}.d2h-hide:target+.d2h-show{display:inline}.d2h-hide:target{display:none}.d2h-hide:target~.d2h-file-list{display:block} \ No newline at end of file