Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 26 deletions

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 5f90dd62426..600a40da98b 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -799,29 +799,6 @@
   }
 }
 
-.participants-more,
-.user-list-more {
-  margin-left: 5px;
-
-  a,
-  .btn-link {
-    color: $gl-text-color-secondary;
-  }
-
-  .btn-link {
-    padding: 0;
-  }
-
-  .btn-link:hover {
-    color: $blue-800;
-    text-decoration: none;
-  }
-
-  .btn-link:focus {
-    text-decoration: none;
-  }
-}
-
 .sidebar-help-wrap {
   .sidebar-help-state {
     margin: 16px -20px -20px;
diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss
index c2c38de9aca..14c23c2b7a9 100644
--- a/app/assets/stylesheets/page_bundles/merge_requests.scss
+++ b/app/assets/stylesheets/page_bundles/merge_requests.scss
@@ -416,7 +416,7 @@ $tabs-holder-z-index: 250;
 
   .media-body {
     min-width: 0;
-    font-size: 12px;
+    font-size: $gl-font-size-sm;
     margin-left: 32px;
   }
 
@@ -648,7 +648,6 @@ $tabs-holder-z-index: 250;
 
   .label-branch {
     @include gl-font-monospace;
-    font-size: 95%;
     overflow: hidden;
     word-break: break-all;
   }
@@ -662,7 +661,7 @@ $tabs-holder-z-index: 250;
       > span {
         display: inline-block;
         max-width: 12.5em;
-        margin-bottom: -5px;
+        margin-bottom: px-to-rem(-5px);
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;