From f97bf09263fe8ef7ba4dcf231dfe7b8265b1e0df Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 27 Apr 2011 21:22:12 -0400 Subject: [PATCH] Centralized markdown transforms. Moved config ops to GitBlit. --- src/com/gitblit/wicket/resources/gitblit.css | 308 ++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 244 insertions(+), 64 deletions(-) diff --git a/src/com/gitblit/wicket/resources/gitblit.css b/src/com/gitblit/wicket/resources/gitblit.css index 42ab2c0..5384546 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 { @@ -16,9 +20,10 @@ margin-left: auto; margin-top: none; padding: 0px; + background: url(background.png) repeat-x scroll 0 0 #FFFFFF; } -pre, pre.prettyprint, pre.plainprint { +pre, code, pre.prettyprint, pre.plainprint { color: black; font-family: monospace; font-size:12px; @@ -27,14 +32,14 @@ /* age0: age < 60*60*2 */ .age0 { - color: #009900; + color: #008000; font-style: italic; font-weight: bold; } /* age1: 60*60*2 <= age < 60*60*24*2 */ .age1 { - color: #009900; + color: #008000; font-style: italic; } @@ -67,19 +72,27 @@ line-height: inherit; } -div.header { +div.header, div.commitHeader { background-color: #D2C3AF; padding: 3px; border: 1px solid #808080; } -div.header a { +div.header { + border-radius: 3px 3px 0 0; +} + +div.commitHeader { + border-radius: 3px; +} + +div.header a, div.commitHeader a { color: black; text-decoration: none; font-weight: bold; } -div.header a:hover { +div.header a:hover, div.commitHeader a:hover { text-decoration: underline; } @@ -87,26 +100,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,8 +117,8 @@ font-family: sans-serif; font-weight: bold; font-size: 150%; - color: #bbb; - background-color: #ffffff; + color: #888; + background: transparent; } div.page_header span { @@ -140,6 +142,7 @@ } div.page_footer { + clear: both; height: 17px; color: black; background-color: #ffffff; @@ -151,7 +154,8 @@ div.page_nav { color: #ddd; background-color: #000070; - padding: 5px; + padding: 7px; + border-radius: 3px; } div.page_nav a { @@ -171,10 +175,30 @@ padding: 2px 5px 7px 5px; } -.repositories_message { - border: solid #bbb; - border-width: 0px 0px 1px; - padding: 8px; +div.search { + color:yellow; + text-align:right; + float:right; + padding:4px 4px 3px 3px; + border-left: 1px solid #8080f0; + margin: 0px; + height: 23px; +} + +div.search input { + vertical-align: top; + background: url(/com/gitblit/wicket/resources/search-icon.png) no-repeat 4px center; + color: #ddd; + background-color: #000070; + border: 1px solid transparent; + padding: 2px 2px 2px 22px; + margin: 0px; +} + +div.search input:hover, div.search input:focus { + color: white; + border-bottom: 1px solid orange; + outline: none; } div.page_path { @@ -187,19 +211,19 @@ div.commit_message { padding: 8px; border: solid #bbb; - border-width: 1px 0px 1px; + border-width: 1px 0px 0px; } div.bug_open, span.bug_open { padding: 2px; - background-color: #800000; + background-color: #803333; color: white; text-align: center; } div.bug_resolved, span.bug_resolved { padding: 2px; - background-color: #008000; + background-color: #408040; color: white; text-align: center; } @@ -218,6 +242,7 @@ div.diff { font-family: monospace; + overflow: auto; } div.diff.header { @@ -229,9 +254,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 +266,17 @@ font-family: inherit; } -div.diff.add { +span.diff.add { color: #008800; font-family: inherit; } -div.diff.remove { - color: #cc0000; +span.diff.remove { + color: #FFDDDD; font-family: inherit; } -div.diff.unchanged { +span.diff.unchanged { color: inherit; font-family: inherit; } @@ -280,9 +305,117 @@ 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; + width: 30px; +} + +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; +} + +td.changeType { + width: 15px; +} + +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: #ccffcc; +} + +span.modification { + background-color: #ffdd88; +} + +span.deletion { + background-color: #f8bbbb; +} + +span.rename { + background-color: #cAc2f5; +} + +div.commitLegend { + float: right; + padding: 0.4em; + vertical-align:top; + margin: 0px; +} + +div.commitLegend span { + font-size: 0.9em; + vertical-align: top; +} + +div.references { + float: right; + text-align: right; +} + a.list { text-decoration: none; color: #000000; +} + +a.list.subject { + font-weight: bold; +} + +a.list.name { + font-weight: bold; } a.list:hover { @@ -304,27 +437,63 @@ padding: 8px; } -table.pretty, table.repositories { - margin-top:5px; +table.plain td.edit { + padding: 3px; +} + +table.plain td.edit input { + margin: 0px; + outline: 1px solid transparent; + border: 1px solid #ccc; + padding-left:5px; +} + +table.plain td.edit input:focus, table.plain td.edit input:hover{ + border: 1px solid orange; +} + +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.repositories { - width:100%; +table.pretty, table.comments, table.repositories { + width:100%; +} + +table.pretty td.icon { + padding: 0px 0px 0px 2px; + width: 18px; +} + +table.pretty td.icon img { + vertical-align: top; +} + +table.pretty td { + padding: 2px 4px; +} + +table.comments td { + padding: 4px; + line-height: 17px; } table.repositories th { background-color:#D2C3AF; padding: 4px; + border-top: 1px solid #808080; border-bottom: 1px solid #808080; } table.repositories td { - padding: 4px; + padding: 2px; +} + +table.repositories td.icon img { + vertical-align: top; } table.repositories th a { @@ -390,20 +559,21 @@ font-style: italic; } -td.sha1, td.sha1 span { +span.sha1, span.sha1 a, span.sha1 a span { font-family: monospace; font-size: 13px; } td.mode { + text-align: right; font-family: monospace; - width:90px; + width: 8em; padding-right:15px; } td.size { text-align: right; - width:100px; + width: 8em; padding-right:15px; } @@ -411,41 +581,51 @@ text-align: right; } -span.refs span { - padding: 0px 4px; +td.treeLinks { + text-align: right; + width: 13em; +} + +span .tagRef, span .headRef, span .remoteRef, span .otherRef { + padding: 0px 3px; + 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; + color: black; } -span.refs span a { +span .tagRef a span, span .headRef a span, span .remoteRef a span, span .otherRef a span { + font-size: 9px; +} + +span .tagRef a, span .headRef a, span .remoteRef a, span .otherRef a { text-decoration: none; - color: inherit; + color: black !important; } -span.refs span a:hover { +span .tagRef a:hover, span .headRef a:hover, span .remoteRef a:hover, span .otherRef a:hover { + color: black !important; 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 { - background-color: #aaaaff; +span .remoteRef { + background-color: #cAc2f5; border-color: #ccccff #0033cc #0033cc #ccccff; } -span.refs span.tag { +span .tagRef { background-color: #ffffaa; - border-color: #ffffcc #ffee00 #ffee00 #ffffcc; + border-color: #ffcc00 #ffcc00 #ffcc00 #ffcc00; } -span.refs span.head { - background-color: #aaffaa; +span .headRef { + background-color: #ccffcc; border-color: #ccffcc #00cc33 #00cc33 #ccffcc; } \ No newline at end of file -- Gitblit v1.9.1