Merge branch '18962-update-issues-button-jumps' into 'master'

Align bulk update issues button to the right

Closes #18962

See merge request !8591
This commit is contained in:
Alfredo Sumaran 2017-03-07 22:08:30 +00:00
commit 7f2819b778
4 changed files with 36 additions and 5 deletions

View File

@ -4,6 +4,21 @@
&.reset-filters { &.reset-filters {
padding: 7px; padding: 7px;
} }
&.update-issues-btn {
float: right;
margin-right: 0;
@media (max-width: $screen-xs-max) {
float: none;
}
}
}
.filters-section {
@media (max-width: $screen-xs-max) {
display: inline-block;
}
} }
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
@ -34,6 +49,11 @@
display: block; display: block;
margin: 0 0 10px; margin: 0 0 10px;
} }
.dropdown-menu-toggle,
.update-issues-btn .btn {
width: 100%;
}
} }
.filtered-search-container { .filtered-search-container {
@ -111,7 +131,15 @@
overflow: auto; overflow: auto;
} }
@media (max-width: $screen-xs-min) { @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
.issues-details-filters {
.dropdown-menu-toggle {
width: 100px;
}
}
}
@media (max-width: $screen-xs-max) {
.issues-details-filters { .issues-details-filters {
padding: 0 0 10px; padding: 0 0 10px;
background-color: $white-light; background-color: $white-light;
@ -205,4 +233,4 @@
.filter-dropdown-loading { .filter-dropdown-loading {
padding: 8px 16px; padding: 8px 16px;
} }

View File

@ -100,8 +100,7 @@
@media (max-width: $screen-sm-max) { @media (max-width: $screen-sm-max) {
.issues-filters { .issues-filters {
.milestone-filter, .milestone-filter {
.labels-filter {
display: none; display: none;
} }
} }

View File

@ -112,7 +112,7 @@
= hidden_field_tag 'update[issuable_ids]', [] = hidden_field_tag 'update[issuable_ids]', []
= hidden_field_tag :state_event, params[:state_event] = hidden_field_tag :state_event, params[:state_event]
.filter-item.inline .filter-item.inline.update-issues-btn
= button_tag "Update #{type.to_s.humanize(capitalize: false)}", class: "btn update_selected_issues btn-save" = button_tag "Update #{type.to_s.humanize(capitalize: false)}", class: "btn update_selected_issues btn-save"
:javascript :javascript

View File

@ -0,0 +1,4 @@
---
title: Align bulk update issues button to the right
merge_request:
author: