From d00a0ca46fcde3e3e580afea6a548b9c12aeac25 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Jul 2012 17:18:02 -0400
Subject: [PATCH] Update to slf4j 1.6.6 and log4j 1.2.17
---
resources/gitblit.css | 167 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 141 insertions(+), 26 deletions(-)
diff --git a/resources/gitblit.css b/resources/gitblit.css
index e3f2bb5..b8792dc 100644
--- a/resources/gitblit.css
+++ b/resources/gitblit.css
@@ -1,6 +1,6 @@
body {
/* 50px to start the container 10px below the navbar */
- padding-top: 50px;
+ padding-top: 60px;
}
footer {
@@ -15,6 +15,9 @@
ul, ol {
margin-bottom: 10px !important;
+}
+a:focus {
+ outline: none;
}
hr {
@@ -37,8 +40,17 @@
color: #0069D6;
}
-.navbar {
- height:40px !important;
+.navbar .brand {
+ padding: 10px 20px;
+}
+
+.navbar .pull-right {
+ margin: 0;
+}
+
+.navbar ul.nav {
+ margin: 0 !important;
+ padding: 4px 0px 0px 0px;
}
.navbar ul.nav li a {
@@ -49,10 +61,14 @@
.navbar ul.nav li a:hover {
color: #abd4ff !important;
+ text-decoration: underline;
+}
+
+.navbar .nav .active > a:hover {
+ text-decoration: underline;
}
.navbar-inner {
- height:40px !important;
background-color:#000050;
background-repeat:repeat-x;
background-image:-khtml-gradient(linear, left top, left bottom, from(#000060), to(#000040));
@@ -74,6 +90,7 @@
background-image: url(arrow_page.png);
background-position: center bottom;
outline: 0;
+ padding-bottom:3px;
}
.navbar .active a {
@@ -131,7 +148,7 @@
}
table {
- margin-bottom:5px !important;
+ margin-bottom: 5px;
font-size: inherit;
}
@@ -152,26 +169,51 @@
color: #888;
}
-.age0, .age1, .age2 {
+.age0, .age1, .age2, .age3, .age4 {
font-size: 12px;
}
-/* age0: age < 60*60*2 */
+/* age0: age < 2 hours */
.age0 {
- color: #008000;
font-style: italic;
+ color: #008000;
font-weight: bold;
}
-/* age1: 60*60*2 <= age < 60*60*24*2 */
+/* age1: 2 hours <= age < 2 days */
.age1 {
- color: #008000;
font-style: italic;
+ color: #0000ff;
+ font-weight: bold;
}
-/* age2: 60*60*24*2 <= age */
+/* age2: 2 days < age <= 7 days */
.age2 {
font-style: italic;
+ color: #2b60de;
+}
+
+/* age3: 7 days < age <= 30 days */
+.age3 {
+ color: #800080;
+}
+
+/* age4: > 30 days */
+.age4 {
+}
+
+/* Ensure that hovered ages are white */
+tr.light:hover .age0,
+tr.light:hover .age1,
+tr.light:hover .age2,
+tr.light:hover .age3,
+tr.light:hover .age4,
+tr.dark:hover .age0,
+tr.dark:hover .age1,
+tr.dark:hover .age2,
+tr.dark:hover .age3,
+tr.dark:hover .age4 {
+ color: #ffffff !important;
}
a.list {
@@ -218,7 +260,6 @@
border-radius: 3px;
padding: 1px 4px 2px 4px;
color: #ffffff;
- font-weight: bold;
vertical-align: center;
}
span.repositorySwatch a {
@@ -242,6 +283,60 @@
padding: 2px;
}
+div.searchResult {
+ padding: 10px 5px 10px 5px;
+}
+
+div.searchResult .summary {
+ font-weight: bold;
+}
+
+div.searchResult .branch {
+ color: #008000;
+}
+
+div.searchResult .author {
+ font-style: italic !important;
+}
+
+div.searchResult .date {
+ color:#999;
+}
+
+div.searchResult .body {
+ padding-left:20px;
+}
+
+div.searchResult .fragment {
+ padding: 7px 0;
+}
+
+div.searchResult .highlight {
+ background-color: #ccff66;
+ padding: 0 2px;
+}
+
+div.searchResult .ellipses {
+ padding-left:25px;
+ color: #aaa;
+}
+
+div.searchResult pre {
+ margin: 1px 0px;
+ border: 0px;
+}
+
+div.searchResult .text {
+ border-left: 2px solid #ccc;
+ border-radius: 0px;
+
+ padding: 0 0 0 15px;
+}
+
+div.searchResult ol {
+ margin-bottom: 0px !important;
+}
+
div.header, div.commitHeader, table.repositories th {
background-color:#e0e0e0;
background-repeat:repeat-x;
@@ -263,6 +358,7 @@
border: 1px solid #ddd;
border-bottom: 0;
border-radius: 3px 3px 0 0;
+ font-weight: bold;
}
div.commitHeader {
@@ -553,7 +649,7 @@
table.plain th, table.plain td {
white-space: nowrap;
- padding: 1px 6px;
+ padding: 1px 3px;
border: 0;
}
@@ -578,6 +674,16 @@
border-left: 0;
}
+table.pretty td.message {
+ padding: 0px;
+}
+
+table.pretty table.nestedTable {
+ width: 100%;
+ margin-left: 4px !important;
+ margin-bottom: 0px !important;
+}
+
table.comments td {
padding: 4px;
line-height: 17px;
@@ -594,13 +700,18 @@
border:0;
}
+table.repositories th.right {
+ border-right: 1px solid #ddd;
+}
+
table.repositories td {
padding: 2px;
border-left: 0;
}
table.repositories td.rightAlign {
- text-align: right;
+ text-align: right;
+ border-right: 1px solid #ddd;
}
table.repositories td.icon img {
@@ -681,6 +792,12 @@
table.activity {
width: 100%;
+ margin-top: 10px;
+}
+
+table.activity td {
+ padding-top:7px;
+ padding-bottom:7px;
}
tr th a { background-position: right; padding-right: 15px; background-repeat:no-repeat; }
@@ -713,7 +830,8 @@
}
td.date {
- font-style: italic !important;
+ /*font-style: italic !important;*/
+ white-space: nowrap;
}
span.sha1, span.sha1 a, span.sha1 a span, pre.commit_message {
@@ -751,7 +869,7 @@
font-size: 2em;
}
-span .tagRef, span .headRef, span .localBranch, span .remoteBranch, span .otherRef {
+.tagRef, .headRef, .localBranch, .remoteBranch, .otherRef {
padding: 0px 3px;
margin-right:2px;
font-family: sans-serif;
@@ -761,41 +879,38 @@
color: black;
}
-span .tagRef a span, span .headRef a span, span .localBranch a span, span .remoteBranch a span, span .otherRef a span {
+.tagRef a, .headRef a, .localBranch a, .remoteBranch a, .otherRef a {
font-size: 9px;
-}
-
-span .tagRef a, span .headRef a, span .localBranch a, span .remoteBranch a, span .otherRef a {
text-decoration: none;
color: black !important;
}
-span .tagRef a:hover, span .headRef a:hover, span .localBranch a:hover, span .remoteBranch a:hover, span .otherRef a:hover {
+.tagRef a:hover, .headRef a:hover, .localBranch a:hover, .remoteBranch a:hover, .otherRef a:hover {
color: black !important;
text-decoration: underline;
}
-span .otherRef {
+.otherRef {
background-color: #b0e0f0;
border-color: #80aaaa;
}
-span .remoteBranch {
+.remoteBranch {
background-color: #cAc2f5;
border-color: #6c6cbf;
}
-span .tagRef {
+.tagRef {
background-color: #ffffaa;
border-color: #ffcc00;
}
-span .headRef {
+.headRef {
background-color: #ffaaff;
border-color: #ff00ee;
}
-span .localBranch {
+.localBranch {
background-color: #ccffcc;
border-color: #00cc33;
}
--
Gitblit v1.9.1