summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-10-13 11:18:56 +0100
committerPhil Hughes <me@iamphill.com>2016-10-13 11:18:56 +0100
commit9ec7aeac2362151e15e59531f347f2d7924437f8 (patch)
tree4611fd5b0d2f58f2643623fc35374f94373c950c
parent96ee975805dd9bbb20bd26edf2dcc7bfdc858c78 (diff)
downloadgitlab-ce-members-ui.tar.gz
Tweaked position of badge in panel headingsmembers-ui
Various UI tweaks
-rw-r--r--app/assets/stylesheets/framework/panels.scss5
-rw-r--r--app/assets/stylesheets/framework/selects.scss2
-rw-r--r--app/assets/stylesheets/pages/members.scss4
3 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/panels.scss b/app/assets/stylesheets/framework/panels.scss
index c6f30e144fd..5ba0486177f 100644
--- a/app/assets/stylesheets/framework/panels.scss
+++ b/app/assets/stylesheets/framework/panels.scss
@@ -13,6 +13,11 @@
.dropdown-menu-toggle {
line-height: 20px;
}
+
+ .badge {
+ margin-top: -2px;
+ margin-left: 5px;
+ }
}
.panel-body {
diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss
index b309e2ad9f4..58f9db0fb21 100644
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -94,7 +94,7 @@
}
.select2-search-choice {
- margin: 8px 0 0 8px;
+ margin: 5px 0 0 8px;
box-shadow: none;
border-color: $input-border;
color: $gl-text-color;
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index ff4fd751f26..756efa9c7fa 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -9,6 +9,10 @@
float: left;
width: 50%;
}
+
+ strong {
+ font-weight: 600;
+ }
}
.controls {