diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-01-05 12:25:47 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-01-06 11:00:33 -0600 |
| commit | 23e6d8c3682c116db909d0eabfaedb57df85bf36 (patch) | |
| tree | 9176222e0df0b98e58ac973c481fef4a2bfccdc5 | |
| parent | 5ce4883da07c939cc97ef4965aeb6e07adb688be (diff) | |
| download | gitlab-ce-25985-combine-members-and-groups-settings-pages.tar.gz | |
Moved the "import" button next to the "Add to project" button25985-combine-members-and-groups-settings-pages
Fixed padding and margins for the dropdowns on the members section
4 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index 277d4202950..cb25b808374 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -163,6 +163,10 @@ ul.content-list { &:last-child { margin-right: 0; + + @media(max-width: $screen-xs-max) { + margin: 0 auto; + } } } diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss index 18c65191ea1..be7193bae04 100644 --- a/app/assets/stylesheets/pages/members.scss +++ b/app/assets/stylesheets/pages/members.scss @@ -25,7 +25,7 @@ } .form-horizontal { - margin-top: 5px; + margin-top: 20px; @media (min-width: $screen-sm-min) { display: -webkit-flex; diff --git a/app/views/projects/project_members/_index.html.haml b/app/views/projects/project_members/_index.html.haml index bd8d030c73e..ab0771b5751 100644 --- a/app/views/projects/project_members/_index.html.haml +++ b/app/views/projects/project_members/_index.html.haml @@ -2,7 +2,6 @@ .col-lg-3.settings-sidebar %h4.prepend-top-0 Members - = link_to "Import", import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-default visible-xs visible-sm pull-right", title: "Import members from another project" - if can?(current_user, :admin_project_member, @project) %p Add a new member to diff --git a/app/views/projects/project_members/_new_project_member.html.haml b/app/views/projects/project_members/_new_project_member.html.haml index a2d10ca3015..2b1c23f7dda 100644 --- a/app/views/projects/project_members/_new_project_member.html.haml +++ b/app/views/projects/project_members/_new_project_member.html.haml @@ -15,4 +15,4 @@ .help-block.append-bottom-10 On this date, the member(s) will automatically lose access to this project. = f.submit "Add to project", class: "btn btn-create" - = link_to "Import", import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-default hidden-xs hidden-sm pull-right", title: "Import members from another project" + = link_to "Import", import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-default", title: "Import members from another project" |