From 3df3496185d229e6f1cdeb6f182f7933884ca29c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 20 Apr 2011 22:14:37 -0400 Subject: [PATCH] Selectable diff presentation: gitblit, gitweb, or plain. --- src/com/gitblit/wicket/resources/gitblit.css | 62 +++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/resources/gitblit.css b/src/com/gitblit/wicket/resources/gitblit.css index d3d68b7..eff6f2a 100644 --- a/src/com/gitblit/wicket/resources/gitblit.css +++ b/src/com/gitblit/wicket/resources/gitblit.css @@ -4,7 +4,7 @@ html, body, table, dl, dt, dd, ol, ul, li, form, a, span, tr, th, td, div, em { font-family: verdana, sans-serif; font-size: 12px; - line-height: 15px; + line-height: 1.35em; margin: 0; padding: 0; border: 0; @@ -22,7 +22,7 @@ padding: 0px; } -pre, pre.prettyprint, pre.plainprint { +pre, code, pre.prettyprint, pre.plainprint { color: black; font-family: monospace; font-size:12px; @@ -75,6 +75,7 @@ background-color: #D2C3AF; padding: 3px; border: 1px solid #808080; + border-radius: 3px 3px 0 0; } div.header a { @@ -146,6 +147,7 @@ color: #ddd; background-color: #000070; padding: 7px; + border-radius: 3px; } div.page_nav a { @@ -169,7 +171,7 @@ color:yellow; text-align:right; float:right; - padding:3px 4px 3px 3px; + padding:4px 4px 3px 3px; } .repositories_message { @@ -219,6 +221,7 @@ div.diff { font-family: monospace; + overflow: auto; } div.diff.header { @@ -281,6 +284,59 @@ font-family: inherit; } +div.diff.add2 { + background-color: #DDFFDD; + font-family: inherit; +} + +div.diff.remove2 { + background-color: #FFDDDD; + font-family: inherit; +} + +div.diff table { + border-right: 1px solid #bbb; + border-bottom: 1px solid #bbb; + width: 100%; +} + +div.diff table th, div.diff table td { + margin: 0px; + padding: 0px; + font-family: monospace; +} + +div.diff table th { + background-color: #faf8dc; + border-left: 1px solid #bbb; + text-align: center; + color: #999; + padding-left: 5px; + padding-right: 5px; +} + +div.diff table th.header { + background-color: #D2C3AF; + border-right: 0px; + border-bottom: 1px solid #808080; + font-family: inherit; + font-size:0.9em; + color: black; + padding: 2px; + text-align: left; +} + +div.diff table td.hunk_header { + background-color: #dAe2e5 !important; + border-bottom: 1px solid #bac2c5; + color: #555; +} + +div.diff table td { + border-left: 1px solid #bbb; + background-color: #fbfbfb; +} + span.addition, span.modification, span.deletion, span.rename { border: 1px solid #888; float: left; -- Gitblit v1.9.1