From a645ba09d693495c50ab0ee0d1fc2734407b73a4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 21 Apr 2011 20:50:59 -0400
Subject: [PATCH] Added merge icon. Added commit legend with counts. Improved header.
---
src/com/gitblit/wicket/resources/gitblit.css | 93 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/wicket/resources/gitblit.css b/src/com/gitblit/wicket/resources/gitblit.css
index 3c5aca8..fa78cec 100644
--- a/src/com/gitblit/wicket/resources/gitblit.css
+++ b/src/com/gitblit/wicket/resources/gitblit.css
@@ -20,6 +20,7 @@
margin-left: auto;
margin-top: none;
padding: 0px;
+ background: url(background.png) repeat-x scroll 0 0 #FFFFFF;
}
pre, code, pre.prettyprint, pre.plainprint {
@@ -110,7 +111,7 @@
font-weight: bold;
font-size: 150%;
color: #888;
- background-color: #ffffff;
+ background: transparent;
}
div.page_header span {
@@ -221,6 +222,7 @@
div.diff {
font-family: monospace;
+ overflow: auto;
}
div.diff.header {
@@ -283,6 +285,64 @@
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;
@@ -306,6 +366,22 @@
span.rename {
background-color: #8888ff;
+}
+
+div.commitLegend {
+ float: right;
+ padding: 0.4em;
+ vertical-align:top;
+}
+
+div.commitLegend span {
+ font-size: 0.9em;
+ vertical-align: top;
+}
+
+div.references {
+ float: right;
+ text-align: right;
}
a.list {
@@ -347,6 +423,9 @@
border-right: 1px solid #bbb;
}
+table.pretty, table.comments, table.repositories {
+ width:100%;
+}
table.pretty td {
padding: 2px 4px;
}
@@ -354,10 +433,6 @@
table.comments td {
padding: 4px;
line-height: 17px;
-}
-
-table.repositories {
- width:100%;
}
table.repositories th {
@@ -455,13 +530,13 @@
}
span .tagRef, span .headRef, span .remoteRef, span .otherRef {
- padding: 0px 4px;
+ padding: 0px 3px;
margin-right:2px;
font-family: sans-serif;
font-size: 9px;
font-weight: normal;
border: 1px solid;
- color: black;
+ color: black;
}
span .tagRef a span, span .headRef a span, span .remoteRef a span, span .otherRef a span {
@@ -470,11 +545,11 @@
span .tagRef a, span .headRef a, span .remoteRef a, span .otherRef a {
text-decoration: none;
- color: black;
+ color: black !important;
}
span .tagRef a:hover, span .headRef a:hover, span .remoteRef a:hover, span .otherRef a:hover {
- color: black;
+ color: black !important;
text-decoration: underline;
}
--
Gitblit v1.9.1