From b2775fefaafb0ce89094bdd4bb5308dbb90f487b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 19 Feb 2014 09:04:55 -0500
Subject: [PATCH] Merge commit 'refs/tickets/08/8/3' of https://dev.gitblit.com/r/gitblit

---
 src/main/resources/gitblit.css |   99 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 91 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css
index 9e75fa6..91825f7 100644
--- a/src/main/resources/gitblit.css
+++ b/src/main/resources/gitblit.css
@@ -34,6 +34,10 @@
 	vertical-align: text-bottom;
 }
 
+a.bugtraq {
+    font-weight: bold;
+}
+
 [class^="icon-"], [class*=" icon-"] i {
 	/* override for a links that look like bootstrap buttons */
 	vertical-align: text-bottom;
@@ -101,6 +105,16 @@
 	padding-bottom: 1px;
 	border-bottom: 3px solid #ff9900;
 	margin-bottom: -1px;
+}
+
+ul.nav {
+	border-color: #ccc;
+}
+
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover {
+  border: 1px solid #ccc;
+  border-bottom-color: transparent;
 }
 
 .navbar .active a {
@@ -1277,6 +1291,11 @@
 }
 table.palette td.pane {
 	padding: 0px;
+	width: 250px !important;
+}
+
+table.palette td.pane select {
+	width: 250px !important;
 }
 
 table.gitnotes {		
@@ -1308,6 +1327,7 @@
 }
 
 table.annotated {
+	width: 100%;
 	border:1px solid #ddd;
 }
 
@@ -1322,6 +1342,24 @@
 table.annotated td {
 	padding: 0px;
 	border: 0;
+}
+
+table.annotated td.lineCommit {
+	padding-left: 5px;
+	padding-right: 5px;
+}
+
+table.annotated td.lineNumber {
+	border-right: 1px solid #ddd;
+	border-left: 1px solid #ddd;
+	padding-left: 5px;
+	padding-right: 5px;
+	text-align: right;
+}
+
+table.annotated td.lineContent {
+	padding-left: 5px;
+	font: monospace;
 }
 
 table.activity {
@@ -1369,7 +1407,7 @@
 	white-space: nowrap;
 }
 
-span.sha1, span.sha1 a, span.sha1 a span, .commit_message, span.shortsha1 {
+span.sha1, span.sha1 a, span.sha1 a span, .commit_message, span.shortsha1, td.sha1 {
 	font-family: consolas, monospace;
 	font-size: 13px;
 }
@@ -1507,8 +1545,57 @@
 li.L7,
 li.L9 { background: #fafafa !important; }
 
-div.markdown {
-	max-width: 900px;
+div.docs {
+	max-width: 880px;
+}
+
+div.docs ul.nav {	
+	margin-bottom: 0px !important;
+}
+
+div.docs div.docnav {
+	display: inline-block;
+	padding: 6px 5px 6px 5px;	
+	border-left: 1px solid #ccc;
+	border-right: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
+	border-radius: 0px 0px 3px 3px;	
+	background-color: #ECF1F4;
+	color: #666;
+	text-align: left;
+	margin-top: -10px;
+}
+
+div.docs .content {
+	margin-top: 10px;
+}
+
+div.docs div.markdown {
+	margin-top: 10px;
+}
+
+div.markdown {	
+	line-height: 1.4;
+}
+
+div.markdown h1 {
+	padding: 0px 0px 4px;
+	border-bottom: 1px solid rgb(221, 221, 221);
+	margin: 4px 0px 8px;
+}
+
+div.markdown h2 {
+	padding: 4px 0px;
+	border-bottom: 1px solid rgb(238, 238, 238);
+	margin: 4px 0px 8px;
+}
+
+div.markdown h3 {
+	padding: 8px 0px 4px;	
+}
+
+div.markdown li {
+	line-height: 1.4;
 }
 
 div.markdown pre {
@@ -1533,11 +1620,7 @@
 	background-color: rgb(250, 250, 250);
 	border: 1px solid rgb(221, 221, 221);
     border-radius: 3px;
-    padding: 0 0.2em;
-}
-
-div.markdown a {
-	text-decoration: underline;	
+    padding: 0 0.4em;
 }
 
 div.markdown table {

--
Gitblit v1.9.1