From cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Oct 2011 21:03:52 -0400
Subject: [PATCH] Merge branch 'master' into rpc

---
 resources/bootstrap.gb.css |  104 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/resources/bootstrap.gb.css b/resources/bootstrap.gb.css
index 2ea2b5c..6ff047b 100644
--- a/resources/bootstrap.gb.css
+++ b/resources/bootstrap.gb.css
@@ -1,5 +1,31 @@
-.topbar{
+body, input, select {
+	color: #202020;
+}
+
+ul, ol {
+	margin-bottom: 10px !important;
+}
+
+hr {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+.page-header h1, .page-header h2 {
+	color: #0069D6;
+}
+
+.topbar {
 	height:40px !important;
+}
+
+.topbar a {
+  	color: white; 
+	text-shadow: none;
+}
+
+.nav a:hover {
+	color: #abd4ff !important;
 }
 
 .topbar-inner,.topbar .fill{
@@ -18,6 +44,12 @@
 	-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 	box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 	border-bottom: 2px solid #ff9900 !important;
+}
+
+.topbar ul li:focus, .topbar .active {
+	background-repeat:no-repeat;
+	background-image: url(arrow_page.png);
+	background-position: center bottom;
 }
 
 .breadcrumb {
@@ -51,6 +83,7 @@
 	font-size:12px;
 	border:0px;
 	padding: 0;
+	line-height: 1.35em;
 }
 
 table {
@@ -85,7 +118,7 @@
 
 a.list {
 	text-decoration: none;
-	color: #000000;
+	color: inherit;
 }
 
 a.list.subject {
@@ -126,6 +159,11 @@
 img.inlineIcon {
 	padding-left: 1px;
 	padding-right: 1px;
+}
+
+img.overview {
+	float:right;
+	border:1px solid #CCCCCC;
 }
 
 div.header, div.commitHeader, table.repositories th {
@@ -197,26 +235,41 @@
 	-webkit-border-radius:0;-moz-border-radius:0x;border-radius:0;
 	vertical-align: top;
 	background: url(search-icon.png) no-repeat 4px center;
-	color: #ddd;
 	background-color: transparent;
 	border: 1px solid transparent;
+	outline: none;
 	padding: 2px 2px 2px 22px;
+	text-shadow: none;
 	margin: 0px;
+	
+	color: #ddd;
 }
 
 div.search input:hover, div.search input:focus {
-	background: url(search-icon.png) no-repeat 4px center;
-	color: white;
+	background-color: transparent;
+	border: 1px solid transparent;
+	padding: 2px 2px 2px 22px;
+	text-shadow: none;
+	
+	color: #ddd;
 	border-bottom: 1px solid #ff9900;	
-	outline: none;
 }
 
-div.search input:focused {	
-	background: url(search-icon.png) no-repeat 4px center;
+div.search input:focus {
 	color: white;
-	border-bottom: 1px solid #ff9900;	
-	outline: none;
-	padding: 0 !important;
+}
+
+/* div.search input:focused { */
+/* 	background-color: transparent; */
+/* 	border: 1px solid transparent; */
+/* 	padding: 2px 2px 2px 22px; */
+/* 	text-shadow: none; */
+/* } */
+
+div.login input:focus {
+	background-color: rgba(255, 255, 255, 0.6);	
+	text-shadow: none;
+	color: white;
 }
 
 div.commit_message {
@@ -489,8 +542,8 @@
 	color: black;
 	background-color: #ddd;
 	padding-left: 5px;
-	border-top: 1px solid #ccc;
-	border-bottom: 1px solid #ccc;
+	border-top: 1px solid #aaa; 	
+ 	border-bottom: 1px solid #aaa; 
 }
 
 table.palette { border:0; width: 0 !important; }
@@ -534,8 +587,6 @@
 }
 
 table.annotated {
-	width: 100%;
-	border: 1px solid #bbb;
 }
 
 table.annotated tr.even {
@@ -543,13 +594,18 @@
 }
 
 table.annotated tr.odd {
-	background-color: #fdfbdf;
+	background-color: #f5f5f5;
 }
 
 table.annotated td {
 	padding: 0px;
 	border: 0;
 }
+
+tr th a { background-position: right; padding-right: 15px; background-repeat:no-repeat; }
+tr th.wicket_orderDown a {background-image: url(arrow_down.png); }
+tr th.wicket_orderUp a { background-image: url(arrow_up.png); }
+tr th.wicket_orderNone a { background-image: url(arrow_off.png); }
 
 tr.light {
 	background-color: #ffffff;
@@ -659,8 +715,24 @@
 	border-color: #00cc33;
 }
 
+table .palette td.buttons button {
+	-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;	
+	border: 1px solid #ccc !important;
+	padding: 10px;
+	margin-bottom: 10px;
+}
+
+table .palette td.buttons button:hover {
+	border: 1px solid #0069D6 !important;
+}
+
+table .palette td.buttons button:active {
+	border: 1px solid orange !important;
+}
+
 .feedbackPanelERROR, .feedbackPanelINFO {	
 	list-style: none;
+	line-height: 35px;
 }
 
 .feedbackPanelINFO span, .feedbackPanelERROR span {

--
Gitblit v1.9.1