From 143f4ec9c46e1eeb350406e960db41b11ead92a6 Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Sun, 30 Jun 2013 23:09:40 +0900
Subject: [PATCH] Fix side menu styles because it had broken existing
 nav-stacked lists.

---
 src/main/twirl/admin/menu.scala.html            |  2 +-
 src/main/twirl/settings/menu.scala.html         |  2 +-
 src/main/webapp/assets/common/css/gitbucket.css | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/twirl/admin/menu.scala.html b/src/main/twirl/admin/menu.scala.html
index c2dcd954b..d9c7969aa 100644
--- a/src/main/twirl/admin/menu.scala.html
+++ b/src/main/twirl/admin/menu.scala.html
@@ -3,7 +3,7 @@
 <div class="row-fluid">
   <div class="span3">
     <div class="box">
-      <ul class="nav nav-tabs nav-stacked">
+      <ul class="nav nav-tabs nav-stacked side-menu">
         <li@if(active=="users"){ class="active"}>
           <a href="@path/admin/users">User Management</a>
         </li>
diff --git a/src/main/twirl/settings/menu.scala.html b/src/main/twirl/settings/menu.scala.html
index 8e88d408c..6627c99d9 100644
--- a/src/main/twirl/settings/menu.scala.html
+++ b/src/main/twirl/settings/menu.scala.html
@@ -4,7 +4,7 @@
 <div class="row-fluid">
   <div class="span3">
     <div class="box">
-      <ul class="nav nav-tabs nav-stacked">
+      <ul class="nav nav-tabs nav-stacked side-menu">
         <li@if(active=="options"){ class="active"}>
           <a href="@url(repository)/settings/options">Options</a>
         </li>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index c95825cdf..ff9abad0a 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -190,33 +190,33 @@ div.signin-form {
 /****************************************************************************/
 /* Stacked side menu */
 /****************************************************************************/
-ul.nav-stacked {
+ul.nav-stacked.side-menu {
   margin-bottom: 0px;
 }
 
-ul.nav-stacked li {
+ul.nav-stacked.side-menu li {
   background-color: #f9f9f9;
 }
 
-ul.nav-stacked li a:hover {
+ul.nav-stacked.side-menu li a:hover {
   background-color: white;
 }
 
-ul.nav-stacked li.active a {
+ul.nav-stacked.side-menu li.active a {
   background-color: white;
   color: black;
   font-weight: bold;
   border-left: 2px solid #cc6666;
 }
 
-ul.nav-stacked li.active a:hover {
+ul.nav-stacked.side-menu li.active a:hover {
   background-color: white;
   color: black;
   font-weight: bold;
   border-left: 2px solid #cc6666;
 }
 
-.nav-tabs.nav-stacked > li:first-child > a {
+.nav-tabs.nav-stacked.side-menu > li:first-child > a {
   -webkit-border-top-right-radius: 0px;
 
   border-top-right-radius: 0px;
@@ -227,7 +227,7 @@ ul.nav-stacked li.active a:hover {
   -moz-border-radius-topleft: 0px;
 }
 
-.nav-tabs.nav-stacked > li:last-child > a {
+.nav-tabs.nav-stacked.side-menu > li:last-child > a {
   -webkit-border-bottom-right-radius: 0px;
 
   border-bottom-right-radius: 0px;