From 5766bfc446ebf1134b2f2caff14144c74547db7c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 20 Aug 2020 18:52:33 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-3-stable-ee

---
 app/assets/stylesheets/framework/lists.scss | 6 +++---
 app/assets/stylesheets/pages/members.scss   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index 9d67b175294..738150dbd2e 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -132,10 +132,10 @@ ul.content-list {
 
     a {
       color: $gl-text-color;
+    }
 
-      &.inline-link {
-        color: $blue-600;
-      }
+    .member-group-link {
+      color: $blue-600;
     }
 
     .description {
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index 2d9a9f3029f..54bca80194f 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -180,6 +180,10 @@
     word-break: break-all;
   }
 
+  .member-group-link {
+    display: inline-block;
+  }
+
   .form-control {
     width: inherit;
   }
-- 
cgit v1.2.3