From 531cd203f387f8358a2e15da5f6171f5871ea688 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 20 Apr 2011 20:16:31 -0400 Subject: [PATCH] Support Markdown rendering. Use Wicket GoogleCharts from Maven. --- src/com/gitblit/wicket/resources/gitblit.css | 132 ++++++++++++++++++++++++++++++-------------- 1 files changed, 90 insertions(+), 42 deletions(-) diff --git a/src/com/gitblit/wicket/resources/gitblit.css b/src/com/gitblit/wicket/resources/gitblit.css index 42ab2c0..3c5aca8 100644 --- a/src/com/gitblit/wicket/resources/gitblit.css +++ b/src/com/gitblit/wicket/resources/gitblit.css @@ -4,7 +4,11 @@ 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; + outline: 0; } body { @@ -18,7 +22,7 @@ padding: 0px; } -pre, pre.prettyprint, pre.plainprint { +pre, code, pre.prettyprint, pre.plainprint { color: black; font-family: monospace; font-size:12px; @@ -71,6 +75,7 @@ background-color: #D2C3AF; padding: 3px; border: 1px solid #808080; + border-radius: 3px 3px 0 0; } div.header a { @@ -87,26 +92,15 @@ padding: 0px 0px 15px 5px; } -div.link { - padding: 2px 5px; +span.link, span.link a { font-family: sans-serif; font-size: 11px; } -div.link span { - font-family: inherit; - font-size: inherit; -} - -div.link a { - font-family: inherit; - font-size: inherit; -} - -div.link em, div.link span em { +span.link em, div.link span em { font-style: normal; - font-family: inherit; - font-size: inherit; + font-family: sans-serif; + font-size: 11px; } div.page_header { @@ -115,7 +109,7 @@ font-family: sans-serif; font-weight: bold; font-size: 150%; - color: #bbb; + color: #888; background-color: #ffffff; } @@ -140,6 +134,7 @@ } div.page_footer { + clear: both; height: 17px; color: black; background-color: #ffffff; @@ -151,7 +146,8 @@ div.page_nav { color: #ddd; background-color: #000070; - padding: 5px; + padding: 7px; + border-radius: 3px; } div.page_nav a { @@ -171,6 +167,13 @@ padding: 2px 5px 7px 5px; } +div.search { + color:yellow; + text-align:right; + float:right; + padding:4px 4px 3px 3px; +} + .repositories_message { border: solid #bbb; border-width: 0px 0px 1px; @@ -187,7 +190,7 @@ div.commit_message { padding: 8px; border: solid #bbb; - border-width: 1px 0px 1px; + border-width: 1px 0px 0px; } div.bug_open, span.bug_open { @@ -229,9 +232,9 @@ background-color: #EDECE6; border-color: #D9D8D1; border-style: solid; - border-width: 1px 0; + border-width: 1px; font-weight: bold; - margin-top: 4px; + margin-top: 10px; padding: 4px 0 2px; } @@ -241,17 +244,17 @@ font-family: inherit; } -div.diff.add { +span.diff.add { color: #008800; font-family: inherit; } -div.diff.remove { +span.diff.remove { color: #cc0000; font-family: inherit; } -div.diff.unchanged { +span.diff.unchanged { color: inherit; font-family: inherit; } @@ -280,9 +283,42 @@ font-family: inherit; } +span.addition, span.modification, span.deletion, span.rename { + border: 1px solid #888; + float: left; + height: 0.8em; + margin: 0.2em 0.5em 0 0; + overflow: hidden; + width: 0.8em; +} + +span.addition { + background-color: #bbffbb; +} + +span.modification { + background-color: #ffdd88; +} + +span.deletion { + background-color: #ff8888; +} + +span.rename { + background-color: #8888ff; +} + a.list { text-decoration: none; color: #000000; +} + +a.list.subject { + font-weight: bold; +} + +a.list.name { + font-weight: bold; } a.list:hover { @@ -304,13 +340,20 @@ padding: 8px; } -table.pretty, table.repositories { - margin-top:5px; +table.pretty, table.repositories, table.comments { margin-bottom:5px; border-spacing: 0px; - border-top: 1px solid #bbb; border-left: 1px solid #bbb; border-right: 1px solid #bbb; +} + +table.pretty td { + padding: 2px 4px; +} + +table.comments td { + padding: 4px; + line-height: 17px; } table.repositories { @@ -390,7 +433,7 @@ font-style: italic; } -td.sha1, td.sha1 span { +span.sha1, span.sha1 a, span.sha1 a span { font-family: monospace; font-size: 13px; } @@ -411,41 +454,46 @@ text-align: right; } -span.refs span { +span .tagRef, span .headRef, span .remoteRef, span .otherRef { padding: 0px 4px; + margin-right:2px; font-family: sans-serif; - font-size: 70%; + font-size: 9px; font-weight: normal; border: 1px solid; - background-color: #ffaaff; - border-color: #ffccff #ff00ee #ff00ee #ffccff; color: black; } -span.refs span a { - text-decoration: none; - color: inherit; +span .tagRef a span, span .headRef a span, span .remoteRef a span, span .otherRef a span { + font-size: 9px; } -span.refs span a:hover { +span .tagRef a, span .headRef a, span .remoteRef a, span .otherRef a { + text-decoration: none; + color: black; +} + +span .tagRef a:hover, span .headRef a:hover, span .remoteRef a:hover, span .otherRef a:hover { + color: black; text-decoration: underline; } -span.refs span.indirect { - font-style: italic; +span .otherRef { + background-color: #ffaaff; + border-color: #ffccff #ff00ee #ff00ee #ffccff; } -span.refs span.ref { +span .remoteRef { background-color: #aaaaff; border-color: #ccccff #0033cc #0033cc #ccccff; } -span.refs span.tag { +span .tagRef { background-color: #ffffaa; border-color: #ffffcc #ffee00 #ffee00 #ffffcc; } -span.refs span.head { +span .headRef { background-color: #aaffaa; border-color: #ccffcc #00cc33 #00cc33 #ccffcc; } \ No newline at end of file -- Gitblit v1.9.1