Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 50 deletions

diff --git a/app/assets/stylesheets/components/related_items_list.scss b/app/assets/stylesheets/components/related_items_list.scss
index 23bd2980c48..6cb7dcca27d 100644
--- a/app/assets/stylesheets/components/related_items_list.scss
+++ b/app/assets/stylesheets/components/related_items_list.scss
@@ -35,6 +35,14 @@ $item-remove-button-space: 42px;
 .item-body {
   position: relative;
   line-height: $gl-line-height;
+  border: 1px solid transparent;
+  border-radius: $gl-border-radius-base;
+
+  &:hover,
+  &:focus-within {
+    background-color: $white;
+    border-color: $gray-50;
+  }
 
   .merge-request-status.closed {
     color: $red-500;
@@ -63,6 +71,7 @@ $item-remove-button-space: 42px;
 
     .sortable-link {
       color: $gray-900;
+      font-weight: 500;
     }
   }
 
@@ -89,16 +98,6 @@ $item-remove-button-space: 42px;
     }
   }
 
-  .item-attributes-area {
-    > * {
-      margin-left: 8px;
-    }
-
-    @include media-breakpoint-down(sm) {
-      margin-left: -8px;
-    }
-  }
-
   .item-milestone,
   .item-weight {
     cursor: help;
@@ -149,7 +148,7 @@ $item-remove-button-space: 42px;
 }
 
 .item-path-id {
-  font-size: $gl-font-size-xs;
+  font-size: $gl-font-size-small;
   white-space: nowrap;
 
   .path-id-text {
@@ -158,30 +157,6 @@ $item-remove-button-space: 42px;
   }
 }
 
-.btn-item-remove {
-  position: absolute;
-  top: $gl-padding-4 / 2;
-  right: 0;
-  padding: $gl-padding-4;
-  margin-right: $gl-padding-4 / 2;
-  line-height: 0;
-  border-color: transparent;
-  background-color: transparent;
-  color: $gl-text-color-secondary;
-
-  .related-items-tree & {
-    position: relative;
-    top: initial;
-    padding: $btn-sm-side-margin;
-    margin-right: initial;
-  }
-
-  &:hover {
-    color: $gl-text-color;
-    border-color: $border-color;
-  }
-}
-
 .mr-ci-status {
   line-height: 0;
 }
@@ -193,10 +168,6 @@ $item-remove-button-space: 42px;
 }
 
 @include media-breakpoint-up(sm) {
-  .item-info-area {
-    flex-basis: 100%;
-  }
-
   .sortable-link {
     max-width: 90%;
   }
@@ -267,18 +238,7 @@ $item-remove-button-space: 42px;
     }
   }
 
-  .btn-item-remove {
-    position: relative;
-    top: initial;
-    padding: $btn-sm-side-margin;
-    margin-right: $gl-padding-4 / 2;
-  }
-
   .sortable-link {
     line-height: 1.3;
   }
-
-  .item-info-area {
-    flex-basis: auto;
-  }
 }