Mobile spacing improvements
This commit is contained in:
parent
49a31e64b7
commit
15a3111a66
5 changed files with 41 additions and 20 deletions
|
@ -125,7 +125,3 @@ label {
|
|||
border-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.help-block {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
|
|
@ -1,15 +1,3 @@
|
|||
.member-search-form {
|
||||
input[type='search'] {
|
||||
width: 225px;
|
||||
vertical-align: bottom;
|
||||
|
||||
@media (max-width: $screen-xs-max) {
|
||||
width: 100px;
|
||||
vertical-align: bottom;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.milestone-row {
|
||||
@include str-truncated(90%);
|
||||
}
|
||||
|
|
|
@ -57,3 +57,39 @@
|
|||
margin-left: auto;
|
||||
line-height: 43px;
|
||||
}
|
||||
|
||||
.member.existing-title {
|
||||
@media (min-width: $screen-sm-min) {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
|
||||
.member-search-form {
|
||||
position: relative;
|
||||
|
||||
@media (min-width: $screen-sm-min) {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.form-control {
|
||||
width: 100%;
|
||||
padding-right: 35px;
|
||||
|
||||
@media (min-width: $screen-sm-min) {
|
||||
width: 350px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.member-search-btn {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
height: 35px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
color: $gray-darkest;
|
||||
background: transparent;
|
||||
border: 0;
|
||||
outline: 0;
|
||||
}
|
||||
|
|
|
@ -15,12 +15,13 @@
|
|||
= render 'shared/members/requests', membership_source: @project, requesters: @requesters
|
||||
|
||||
.append-bottom-default.clearfix
|
||||
%h5.pull-left
|
||||
%h5.member.existing-title
|
||||
Existing users and groups
|
||||
= form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form pull-right hidden-xs hidden-sm' do
|
||||
= form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form' do
|
||||
.form-group
|
||||
= search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
|
||||
= icon("search")
|
||||
%button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
|
||||
= icon("search")
|
||||
- if @groups.size > 0
|
||||
= render 'groups', groups: @groups
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
%span{ class: ('text-warning' if group_link.expires_soon?) }
|
||||
Expires in #{distance_of_time_in_words_to_now(group_link.expires_at)}
|
||||
.controls.member-controls
|
||||
= form_tag namespace_project_group_link_path(@project.namespace, @project, group_link), method: :put, remote: true, class: 'form-horizontal' do
|
||||
= form_tag namespace_project_group_link_path(@project.namespace, @project, group_link), method: :put, remote: true, class: 'form-horizontal js-edit-member-form' do
|
||||
= select_tag 'group_link[group_access]', options_for_select(ProjectGroupLink.access_options, group_link.group_access), class: 'form-control member-form-control append-right-5 js-member-update-control', id: "member_access_level_#{group.id}"
|
||||
.prepend-left-5.append-right-10.clearable-input.member-form-control
|
||||
= text_field_tag 'group_link[expires_at]', group_link.expires_at, class: 'form-control js-access-expiration-date js-member-update-control', placeholder: 'Expiration date', id: "member_expires_at_#{group.id}"
|
||||
|
|
Loading…
Reference in a new issue