From db71db17c90fd93bcf38cdf87e16a371c39708e0 Mon Sep 17 00:00:00 2001
From: Mrbytes <eguervos@msn.com>
Date: Thu, 13 Sep 2012 18:13:48 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit

---
 resources/gitblit.css |   90 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/resources/gitblit.css b/resources/gitblit.css
index 14fe038..7a73a24 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;
 }
 
@@ -310,7 +327,8 @@
 }
 
 div.searchResult .text {
-	border-left: 5px solid #EEEEEE;
+	border-left: 2px solid #ccc;
+	border-radius: 0px;
 	
     padding: 0 0 0 15px;
 }
@@ -425,10 +443,11 @@
 	color: white;
 }
 
-pre.commit_message {	
+.commit_message {
 	padding: 8px;
 	border: solid #ddd;
 	border-width: 1px 0px 0px;
+	border-radius: 0px;
 }
 
 div.bug_open, span.bug_open {
@@ -631,7 +650,7 @@
 
 table.plain th, table.plain td {
 	white-space: nowrap;
-	padding: 1px 6px;
+	padding: 1px 3px;
 	border: 0;
 }
 
@@ -656,6 +675,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;
@@ -672,13 +701,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 {
@@ -687,6 +721,8 @@
 
 table.repositories tr.group {
 	background-color: #ccc;
+	border-left: 1px solid #ccc;
+	border-right: 1px solid #ccc;
 }
 
 table.repositories tr.group td {
@@ -696,6 +732,10 @@
 	padding-left: 5px;
 	border-top: 1px solid #aaa; 	
  	border-bottom: 1px solid #aaa; 
+}
+
+table.repositories tr.group td a {
+	color: black;
 }
 
 table.palette { border:0; width: 0 !important; }
@@ -759,6 +799,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; }
@@ -791,11 +837,12 @@
 }
 
 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 {
-	font-family: monospace;
+span.sha1, span.sha1 a, span.sha1 a span, .commit_message {
+	font-family: consolas, monospace;
 	font-size: 13px;
 }
 
@@ -829,7 +876,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;
@@ -839,41 +886,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