summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-08 18:04:04 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-08 18:04:04 +0000
commitaa7e051357d230c17f9a900589eca59bd6d6fdb0 (patch)
tree2688a42f25d9f6890454b648e71fbded2dc6df1b /app/assets
parent7bd5b8c1c709163547ec865484b341211158ebf1 (diff)
parent59b0f3e5d487cdced3ea92d93d531bded44b1753 (diff)
downloadgitlab-ce-aa7e051357d230c17f9a900589eca59bd6d6fdb0.tar.gz
Merge branch 'ce#31853-projects-shared-groups' into 'master'
31853 Remove duplication for sharing projects with groups in project settings Closes #31853 See merge request !11951
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/members.scss35
1 files changed, 35 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index 971d54e7472..4be0e133b69 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -3,6 +3,41 @@
border-bottom: 1px solid $border-color;
}
+.project-member-tabs {
+ background: $gray-light;
+ border: 1px solid $border-color;
+
+ li {
+ width: 50%;
+
+ &.active {
+ background: $white-light;
+ }
+
+ &:first-child {
+ border-right: 1px solid $border-color;
+ }
+
+ a {
+ width: 100%;
+ text-align: center;
+ }
+ }
+}
+
+.users-project-form {
+ .btn-create {
+ margin-right: 10px;
+ }
+}
+
+.project-member-tab-content {
+ padding: $gl-padding;
+ border: 1px solid $border-color;
+ border-top: 0;
+ margin-bottom: $gl-padding;
+}
+
.member {
.list-item-name {
@media (min-width: $screen-sm-min) {