summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-26 18:07:53 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-26 18:07:53 +0000
commite4990b8c086ece77acbf915129248a3e514e7278 (patch)
tree4c77750c2db7bbbcc57fa08dfd9e359463883abe
parent2fc359a506b5997cb65b6d5f2f5c85df98fd1c69 (diff)
parent1295b16868e7cf21681c1b025b3e1fbd9093b3de (diff)
downloadgitlab-ce-e4990b8c086ece77acbf915129248a3e514e7278.tar.gz
Merge branch '22746-fix-admin-users-mobile-view' into 'master'
Resolve "Admin/Overview/Users mobile view" ## What does this MR do? Fixes mobile layout issues on `/admin/users` page. * Fixes control element placement when long usernames or email addresses overflow their container * Fixes condensed dropdown menu (issue caused by acde2e30) Before: ![Screen_Shot_2016-09-28_at_3.29.11_PM](/uploads/82cd27c367653beb29425065685274dd/Screen_Shot_2016-09-28_at_3.29.11_PM.png) ![Screen_Shot_2016-09-29_at_23.36.40](/uploads/e739638506388be9c5a0709e5f22b298/Screen_Shot_2016-09-29_at_23.36.40.png) After: ![Screen_Shot_2016-10-24_at_11.55.32_PM](/uploads/ab6e49da85688d9fd2abc49de238a5bf/Screen_Shot_2016-10-24_at_11.55.32_PM.png) ## Are there points in the code the reviewer needs to double check? Ensure css changes don't have any side effects elsewhere in GitLab. (I don't think they would...) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22746 See merge request !7087
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss1
-rw-r--r--app/assets/stylesheets/pages/admin.scss9
3 files changed, 11 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1049551239c..876ab0d695b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Please view this file on the master branch, on stable branches it's out of date.
- Prevent award emoji via notes for issues/MRs authored by user (barthc)
- Adds an optional path parameter to the Commits API to filter commits by path (Luis HGO)
- Fix extra space on Build sidebar on Firefox !7060
+ - Fix mobile layout issues in admin user overview page !7087
- Fix HipChat notifications rendering (airatshigapov, eisnerd)
- Add hover to trash icon in notes !7008 (blackst0ne)
- Fix sidekiq stats in admin area (blackst0ne)
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 1de246600fd..810dab22e90 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -15,6 +15,7 @@
@media (max-width: $screen-xs-max) {
width: 100%;
+ min-width: 240px;
}
}
diff --git a/app/assets/stylesheets/pages/admin.scss b/app/assets/stylesheets/pages/admin.scss
index 63396a6bb29..6cefafd8fc7 100644
--- a/app/assets/stylesheets/pages/admin.scss
+++ b/app/assets/stylesheets/pages/admin.scss
@@ -80,10 +80,13 @@
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
+ white-space: nowrap;
}
.user-details {
flex: 1 1 auto;
+ overflow: hidden;
+ padding-right: 8px;
}
.user-name {
@@ -91,6 +94,12 @@
font-weight: 600;
}
+ .user-name,
+ .user-email {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
.dropdown {
.btn-block {
margin-bottom: 0;