Cleanup menu styles

app/assets/stylesheets/layout/_main_menu.sass

@@ -169,28 +169,18 @@ $arrow-left-width: 40px
           padding: initial
 
     &:hover
-      @include varprop(background, main-menu-child-bg-hover-color)
-
       @if $main-menu-enable-toggle-highlighting != true
         // simultaneously hover all menu item anchor tags
         > a
           @include varprop(color, main-menu-bg-hover-background)
 
     > a
-      &.selected, &.selected + a
+      &.selected, &.selected
         @include varprop(background, main-menu-bg-selected-background)
-
+        @include varprop(color, main-menu-selected-font-color)
-
-      &:hover, &.selected, &.selected + a
-        @include varprop(color, main-menu-bg-selected-background)
-
-    a
       &:hover
-        text-decoration: none
         @include varprop(color, main-menu-hover-font-color)
-      &.selected
+        @include varprop(background, main-menu-child-bg-hover-color)
-        border: none !important
-        @include varprop(color, main-menu-selected-font-color)
 
 .main-menu--children-menu-header
   padding: 10px

app/assets/stylesheets/layout/_tree_menu.sass

@@ -13,10 +13,6 @@ div.wiki ul.pages-hierarchy,
     height: $tree-menu-item-height
     line-height: $tree-menu-item-height
 
-  .tree-menu--item.-selected
-    .tree-menu--title
-      @include varprop(color, main-menu-selected-font-color)
-
   .tree-menu--hierarchy-span
     display: inline-block
     width: $hierarchy-span-width
@@ -82,10 +78,15 @@ div.wiki ul.pages-hierarchy,
     height: $tree-menu-item-height
     &.-selected
       @include varprop(background, main-menu-bg-selected-background)
-
+      .tree-menu--title
+        @include varprop(color, main-menu-selected-font-color)
     &:hover
-      @include varprop(color, main-menu-hover-font-color)
       @include varprop(background, main-menu-bg-hover-background)
+      .tree-menu--title
+        @include varprop(color, main-menu-hover-font-color)
+        text-decoration: none
+
+