Commit 23e6d8c3 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas
Browse files

Moved the "import" button next to the "Add to project" button

Fixed padding and margins for the dropdowns on the members section
parent 5ce4883d
......@@ -163,6 +163,10 @@ ul.content-list {
&:last-child {
margin-right: 0;
@media(max-width: $screen-xs-max) {
margin: 0 auto;
}
}
}
......
......@@ -25,7 +25,7 @@
}
.form-horizontal {
margin-top: 5px;
margin-top: 20px;
@media (min-width: $screen-sm-min) {
display: -webkit-flex;
......
......@@ -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
......
......@@ -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"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment