Css tweaks to app menus and top nav bar

4 files changed, 31 insertions, 29 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html
index d49f0188..63a894da 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html
@@ -52,7 +52,7 @@
 						</div>

 					</div>

 					<div class="span7">

-						<div><span class="project" wicket:id="projectTitle">[project title]</span>/<img wicket:id="repositoryIcon" style="padding-left: 10px;"></img><span class="repository" wicket:id="repositoryName">[repository name]</span> <span class="hidden-phone"><span wicket:id="pageName">[page name]</span></span></div>

+						<div><span class="project" wicket:id="projectTitle">[project title]</span>/<span class="repository" wicket:id="repositoryName">[repository name]</span> <span class="hidden-phone"><span wicket:id="pageName">[page name]</span></span></div>

 						<span wicket:id="originRepository">[origin repository]</span>

 					</div>

 				</div>

diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index a477b741..9a806f45 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -246,14 +246,6 @@ public abstract class RepositoryPage extends BasePage {
 			}

 		}

 		

-		// show sparkleshare folder icon

-		if (model.isSparkleshared()) {

-			add(WicketUtils.newImage("repositoryIcon", "folder_star_32x32.png",

-					getString("gb.isSparkleshared")));

-		} else {

-			add(WicketUtils.newClearPixel("repositoryIcon").setVisible(false));

-		}

-		

 		if (getRepositoryModel().isBare) {

 			add(new Label("workingCopyIndicator").setVisible(false));

 		} else {

diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
index b22aa714..2663f88e 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
@@ -27,7 +27,7 @@
 	<wicket:fragment wicket:id="applicationMenusFragment">

 		<div class="btn-toolbar" style="margin: 4px 0px 0px 0px;">

 			<div class="btn-group" wicket:id="appMenus">

-   				<a class="btn btn-mini btn-inverse" data-toggle="dropdown" href="#">   				

+   				<a class="btn btn-mini btn-appmenu" data-toggle="dropdown" href="#">   				

 	    			<span wicket:id="applicationName"></span>

     				<span class="caret"></span>

    				</a>

diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css
index cfb6cf76..131fc008 100644
--- a/src/main/resources/gitblit.css
+++ b/src/main/resources/gitblit.css
@@ -73,16 +73,9 @@ hr {
 }

 

 .navbar-inner {

-	background-color:#000050;

-	background-repeat:repeat-x;

-	background-image:-khtml-gradient(linear, left top, left bottom, from(#000060), to(#000040));

-	background-image:-moz-linear-gradient(top, #000060, #000040);

-	background-image:-ms-linear-gradient(top, #000060, #000040);

-	background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #000060), color-stop(100%, #000040));

-	background-image:-webkit-linear-gradient(top, #000060, #000040);

-	background-image:-o-linear-gradient(top, #000060, #000040);

-	background-image:linear-gradient(top, #000060, #000040);

-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000060', endColorstr='#000040', GradientType=0);

+	background-color: #002060;

+	background-repeat: none;

+	background-image: none;

 	-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);

 	-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);

@@ -117,17 +110,34 @@ navbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.navbar d
 	color: #ffffff !important;

 }

 

-.btn:first-child {

-	border-radius: 4px;

-}

-

 .btn-appmenu {

-    /*background-color: rgb(73, 175, 205);

-    background-image: -moz-linear-gradient(center top , rgb(91, 192, 222), rgb(47, 150, 180));*/

-    background-color: rgb(73, 175, 205);

-    background-image: -moz-linear-gradient(center top , rgb(91, 192, 222), rgb(47, 150, 180));

+	border-radius: 4px !important;

+    background-color: #002060;

+    background-image:-khtml-gradient(linear, left top, left bottom, from(#4060A0), to(#002060));

+	background-image:-moz-linear-gradient(center top, #4060A0, #002060);

+	background-image:-ms-linear-gradient(top, #4060A0, #002060);

+	background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #4060A0), color-stop(100%, #002060));

+	background-image:-webkit-linear-gradient(top, #4060A0, #002060);

+	background-image:-o-linear-gradient(top, #4060A0, #002060);

+	background-image:linear-gradient(top, #4060A0, #002060);

+    

     background-repeat: repeat-x;

     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);

+    color: #ffffff;

+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);

+}

+

+.btn-appmenu:hover, .btn-appmenu:active, .btn-appmenu.active, .btn-appmenu.disabled, .btn-appmenu[disabled] {

+    background-color: #002060;

+    color: #ffffff;

+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);

+}

+

+

+.btn-appmenu .caret {

+    border-bottom-color: #FFFFFF;

+    border-top-color: #FFFFFF;

+    opacity: 0.75;

 }

 

 .breadcrumb {

@@ -1083,7 +1093,7 @@ tr.dark {
 /* currently both use the same, but it can change */

 tr.light:hover,

 tr.dark:hover {

-	background-color: #000070;

+	background-color: #002060;

 	color: white;

 }