summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 18:52:33 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 18:52:33 +0000
commit5766bfc446ebf1134b2f2caff14144c74547db7c (patch)
tree453d541fc7b70cfe14d865eaf15c982840ec2efa /app/assets
parent6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (diff)
downloadgitlab-ce-5766bfc446ebf1134b2f2caff14144c74547db7c.tar.gz
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/lists.scss6
-rw-r--r--app/assets/stylesheets/pages/members.scss4
2 files changed, 7 insertions, 3 deletions
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;
}