Merge pull request #318 from pixelated-project/revert-sidebar-hover

Revert sidebar hover

2 files changed, 11 insertions, 31 deletions

diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss
index 983a1e92..d3c96530 100644
--- a/web-ui/app/scss/styles.scss
+++ b/web-ui/app/scss/styles.scss
@@ -158,6 +158,7 @@
       }
       &.selected {
         background: #FFF;
+        z-index: 3;
         a {
           color: #333;
         }
@@ -253,22 +254,18 @@ section {
       border-right: 1px solid lighten($navigation_background, 10%);
       ul#default-tag-list, #custom-tag-list {
         li {
-          transition: background-color 0.15s, color 0s, z-index 0.15s;
+          transition: background-color 150ms ease-out;
           padding: 2px 10px;
           cursor: pointer;
-
+          &:hover {
+            background: #CCC;
+            color: $navigation_background;
+          }
           &.selected {
             font-weight: bold;
             background: $contrast;
             color: $navigation_background;
           }
-
-          &:hover {
-            z-index: 5;
-            background: #CCC;
-            color: $navigation_background;
-            opacity: 0.90;
-          }
         }
       }
 
@@ -359,25 +356,10 @@ section {
         opacity: 1;
       }
 
-      div.tags-icon-wrap {
-        padding-top: 15px;
-        border-top: 1px solid white;
-      }
-
       div.tags-icon {
-        padding: 10px 0 15px 0;
+        border-top: 1px solid white;
+        padding-top: 25px;
         margin-bottom: 20px;
-        
-        &:hover {
-            background: #CCC;
-            color: $navigation_background;
-            position: relative;
-            z-index: 5;
-            transition: z-index 150ms ease-out;
-            width: 95%;
-            opacity: 0.90;
-          }
-
         i {
           font-size: 1.5em;
           font-family: "FontAwesome";
diff --git a/web-ui/app/templates/tags/tag_list.hbs b/web-ui/app/templates/tags/tag_list.hbs
index 06c46fdf..e265354f 100644
--- a/web-ui/app/templates/tags/tag_list.hbs
+++ b/web-ui/app/templates/tags/tag_list.hbs
@@ -1,8 +1,6 @@
 <ul id="default-tag-list"></ul>
-<div class="tags-icon-wrap">
-  <div class="tags-icon side-nav-toggle">
-    <i class="fa fa-tags"></i>
-    <span class="tag-label">Tags</span>
-  </div>
+<div class="tags-icon side-nav-toggle">
+	<i class="fa fa-tags"></i>
+	<span class="tag-label">Tags</span>
 </div>
 <ul id="custom-tag-list"></ul>
\ No newline at end of file