summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/framework/common.scss4
-rw-r--r--app/views/projects/project_members/_team.html.haml6
-rw-r--r--changelogs/unreleased/26883-members-page-layout-looks-broken.yml4
3 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 0fd7203e72b..f4f285f0fdc 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -425,6 +425,10 @@ table {
}
.str-truncated {
+ &-30 {
+ @include str-truncated(30%);
+ }
+
&-60 {
@include str-truncated(60%);
}
diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml
index 81d57c77edf..b875fa2eec4 100644
--- a/app/views/projects/project_members/_team.html.haml
+++ b/app/views/projects/project_members/_team.html.haml
@@ -1,7 +1,9 @@
.panel.panel-default
.panel-heading
- Members with access to
- %strong= @project.name
+ %span.str-truncated-30
+ Members of
+ %strong
+ #{@project.name}
%span.badge= @project_members.total_count
= form_tag namespace_project_settings_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form' do
.form-group
diff --git a/changelogs/unreleased/26883-members-page-layout-looks-broken.yml b/changelogs/unreleased/26883-members-page-layout-looks-broken.yml
new file mode 100644
index 00000000000..e0e3a529c3e
--- /dev/null
+++ b/changelogs/unreleased/26883-members-page-layout-looks-broken.yml
@@ -0,0 +1,4 @@
+---
+title: Improved UX on project members settings view
+merge_request:
+author: