Add latest changes from gitlab-org/gitlab@master

3 files changed, 12 insertions, 13 deletions

diff --git a/app/assets/stylesheets/disable_animations.scss b/app/assets/stylesheets/disable_animations.scss
index 1e63cdcfa39..1566425ad42 100644
--- a/app/assets/stylesheets/disable_animations.scss
+++ b/app/assets/stylesheets/disable_animations.scss
@@ -1,4 +1,7 @@
-* {
+*:not(
+  /* Keep transition enabled where it would otherwise break specs */
+  .nav-item-link .show-on-focus-or-hover--target /* for spec/features/nav/pinned_nav_items_spec.rb */
+) {
   /* stylelint-disable property-no-vendor-prefix */
   -o-transition: none !important;
   -moz-transition: none !important;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 600a40da98b..f2afa94e000 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -231,18 +231,6 @@
   }
 }
 
-.health-status {
-  .dropdown-body {
-    .health-divider {
-      border-top-color: $gray-100;
-    }
-
-    .dropdown-item:not(.health-dropdown-item) {
-      padding: 0;
-    }
-  }
-}
-
 .toggle-right-sidebar-button {
   @include side-panel-toggle;
   border-bottom: 1px solid $border-color;
diff --git a/app/assets/stylesheets/framework/super_sidebar.scss b/app/assets/stylesheets/framework/super_sidebar.scss
index 8610c41b43f..d2623204982 100644
--- a/app/assets/stylesheets/framework/super_sidebar.scss
+++ b/app/assets/stylesheets/framework/super_sidebar.scss
@@ -159,11 +159,19 @@ $super-sidebar-transition-hint-duration: $super-sidebar-transition-duration / 4;
   }
 
   .nav-item-link {
+    button.show-on-focus-or-hover--target {
+      transition: opacity $gl-transition-duration-fast;
+    }
+
     &:hover,
     &:focus-within {
       .nav-item-badge {
         opacity: 0;
       }
+
+      button.show-on-focus-or-hover--target {
+        transition-delay: $gl-transition-duration-slow;
+      }
     }
   }