summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-09-01 13:48:20 +0100
committerPhil Hughes <me@iamphill.com>2016-09-13 08:44:59 +0100
commit4afd17b2786b5bca075ac7508979fad582c65bc9 (patch)
tree63fc1618f54ef9318e1621b1f15ab574be1a6fbb /app/assets/stylesheets/pages
parent87a0501ded0d08ae718b6f3f6feb4ac2c9c6b016 (diff)
downloadgitlab-ce-4afd17b2786b5bca075ac7508979fad582c65bc9.tar.gz
Included groups on project_members page
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r--app/assets/stylesheets/pages/groups.scss2
-rw-r--r--app/assets/stylesheets/pages/members.scss9
2 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss
index b657ca47d38..a27f7a2fd77 100644
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -1,6 +1,4 @@
.member-search-form {
- float: left;
-
input[type='search'] {
width: 225px;
vertical-align: bottom;
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index 9583d7c6161..4bc34ac15df 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -5,6 +5,15 @@
}
.member {
+ .list-item-name {
+ float: none;
+
+ @media (min-width: $screen-md-min) {
+ float: left;
+ width: 50%;
+ }
+ }
+
.controls {
display: flex;
width: 400px;