kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

CSS cleanup

This commit is contained in:
Phil Hughes 2016-09-05 15:45:23 +01:00
parent fe71edc333
commit 3354bfd8f9
6 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/framework/selects.scss
View File

@ -191,10 +191,6 @@
&.input-clamp { &.input-clamp {
max-width: 100%; max-width: 100%;
} }
&.input-full {
width: 100%;
}
} }
.select2-highlighted { .select2-highlighted {

10
app/assets/stylesheets/pages/members.scss
View File

@ -1,9 +1,3 @@
.project-members-new {
> h5 {
font-weight: normal;
}
}
.member { .member {
.list-item-name { .list-item-name {
float: none; float: none;
@ -16,6 +10,7 @@
.controls { .controls {
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
display: -webkit-flex;
display: flex; display: flex;
width: 400px; width: 400px;
max-width: 50%; max-width: 50%;
@ -26,8 +21,9 @@
margin-top: 5px; margin-top: 5px;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
display: -webkit-flex;
display: flex; display: flex;
flex: 1; width: 100%;
margin-top: 3px; margin-top: 3px;
} }
} }

2
app/views/groups/group_members/_new_group_member.html.haml
View File

@ -1,7 +1,7 @@
= form_for @group_member, url: group_group_members_path(@group), html: { class: 'users-project-form users-group-form' } do |f| = form_for @group_member, url: group_group_members_path(@group), html: { class: 'users-project-form users-group-form' } do |f|
.row .row
.col-md-4.col-lg-6 .col-md-4.col-lg-6
= users_select_tag(:user_ids, multiple: true, class: 'input-full', scope: :all, email_user: true) = users_select_tag(:user_ids, multiple: true, class: 'input-clamp', scope: :all, email_user: true)
.help-block.append-bottom-10 .help-block.append-bottom-10
Search for users by name, username, or email, or invite new ones using their email address. Search for users by name, username, or email, or invite new ones using their email address.

2
app/views/groups/group_members/index.html.haml
View File

@ -6,7 +6,7 @@
%hr %hr
- if can?(current_user, :admin_group_member, @group) - if can?(current_user, :admin_group_member, @group)
.project-members-new.append-bottom-default .project-members-new.append-bottom-default
%h5.clearfix %p.clearfix
Add new user to Add new user to
%strong= @group.name %strong= @group.name
= render "new_group_member" = render "new_group_member"

2
app/views/projects/project_members/_new_project_member.html.haml
View File

@ -1,7 +1,7 @@
= form_for @project_member, as: :project_member, url: namespace_project_project_members_path(@project.namespace, @project), html: { class: 'users-project-form' } do |f| = form_for @project_member, as: :project_member, url: namespace_project_project_members_path(@project.namespace, @project), html: { class: 'users-project-form' } do |f|
.row .row
.col-md-4.col-lg-6 .col-md-4.col-lg-6
= users_select_tag(:user_ids, multiple: true, class: "input-full", scope: :all, email_user: true) = users_select_tag(:user_ids, multiple: true, class: "input-clamp", scope: :all, email_user: true)
.help-block.append-bottom-10 .help-block.append-bottom-10
Search for users by name, username, or email, or invite new ones using their email address. Search for users by name, username, or email, or invite new ones using their email address.

2
app/views/projects/project_members/index.html.haml
View File

@ -7,7 +7,7 @@
%hr %hr
- if can?(current_user, :admin_project_member, @project) - if can?(current_user, :admin_project_member, @project)
.project-members-new.append-bottom-default .project-members-new.append-bottom-default
%h5.clearfix %p.clearfix
Add new user to Add new user to
%strong= @project.name %strong= @project.name
= render "new_project_member" = render "new_project_member"