style updates

fixed weird dropdown items in issues when on merge request page

2 files changed, 32 insertions, 37 deletions

diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index 92d6e1152e6..06c2efb3a4d 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -195,6 +195,7 @@ $new-sidebar-width: 220px;
   > li {
     > a {
       @media (min-width: $screen-sm-min) {
+        margin-left: 4px;
         margin-right: 2px;
       }
     }
@@ -204,10 +205,13 @@ $new-sidebar-width: 220px;
         @media (min-width: $screen-sm-min) {
           position: fixed;
           top: 0;
-          left: 220px;
+          left: 219px;
           width: 150px;
-          background-color: $hover-background;
+          margin-top: -1px;
+          padding: 1px;
+          background-color: $white-light;
           box-shadow: 2px 1px 3px $dropdown-shadow-color;
+          border: 1px solid $gray-darker;
           border-radius: 0 3px 3px 0;
 
           &::before {
@@ -233,19 +237,20 @@ $new-sidebar-width: 220px;
             transform: skew(33deg);
           }
 
-          &.is-above::after {
-            top: auto;
-            bottom: 44px;
-            transform: skew(-30deg);
+          &.is-above {
+            margin-top: 1px;
+
+            &::after {
+              top: auto;
+              bottom: 44px;
+              transform: skew(-30deg);
+            }
           }
 
           a {
-            color: rgba($white-light, .9);
-
             &:hover,
             &:focus {
-              color: $white-light;
-              background-color: rgba($black, .12);
+              background-color: $gray-darker;
             }
           }
         }
@@ -273,8 +278,7 @@ $new-sidebar-width: 220px;
 
     &:not(.active):hover > a,
     > a:hover {
-      background-color: $hover-background;
-      color: $hover-color;
+      background-color: $white-light;
 
       .badge {
         background-color: $indigo-500;
diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml
index 15327847b17..6f31919b360 100644
--- a/app/views/layouts/nav/_new_project_sidebar.html.haml
+++ b/app/views/layouts/nav/_new_project_sidebar.html.haml
@@ -83,34 +83,25 @@
             Issues
 
         %ul.sidebar-sub-level-items
-          - if project_nav_tab?(:issues) && !current_controller?(:merge_requests)
-            = nav_link(controller: :issues) do
-              = link_to project_issues_path(@project), title: 'Issues' do
-                %span
-                  List
-
-            = nav_link(controller: :boards) do
-              = link_to project_boards_path(@project), title: 'Board' do
-                %span
-                  Board
+          = nav_link(controller: :issues) do
+            = link_to project_issues_path(@project), title: 'Issues' do
+              %span
+                List
 
-          - if project_nav_tab?(:merge_requests) && current_controller?(:merge_requests)
-            = nav_link(controller: :merge_requests) do
-              = link_to project_merge_requests_path(@project), title: 'Merge Requests' do
-                %span
-                  Merge Requests
+          = nav_link(controller: :boards) do
+            = link_to project_boards_path(@project), title: 'Board' do
+              %span
+                Board
 
-          - if project_nav_tab? :labels
-            = nav_link(controller: :labels) do
-              = link_to project_labels_path(@project), title: 'Labels' do
-                %span
-                  Labels
+          = nav_link(controller: :labels) do
+            = link_to project_labels_path(@project), title: 'Labels' do
+              %span
+                Labels
 
-          - if project_nav_tab? :milestones
-            = nav_link(controller: :milestones) do
-              = link_to project_milestones_path(@project), title: 'Milestones' do
-                %span
-                  Milestones
+          = nav_link(controller: :milestones) do
+            = link_to project_milestones_path(@project), title: 'Milestones' do
+              %span
+                Milestones
 
     - if project_nav_tab? :merge_requests
       = nav_link(controller: @project.default_issues_tracker? ? :merge_requests : [:merge_requests, :labels, :milestones]) do