summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-01-31 07:59:30 -0600
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-06 14:02:58 -0600
commit78fbee00db5a3b409cd97ea12b9966264df2eb23 (patch)
treec1b7c0c6af7de426a0d155bd4602a6cfe1c40713
parent11db74bd5e11f78bd318a8b01fbe5938000a70fc (diff)
downloadgitlab-ce-18962-update-issues-button-jumps.tar.gz
Make dropdowns smaller on bulk assign issues18962-update-issues-button-jumps
-rw-r--r--app/assets/stylesheets/framework/filters.scss21
-rw-r--r--app/assets/stylesheets/framework/mobile.scss3
-rw-r--r--changelogs/unreleased/18962-update-issues-button-jumps.yml2
3 files changed, 20 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss
index cd905c11382..499398ecf85 100644
--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -7,13 +7,20 @@
&.update-issues-btn {
float: right;
+ margin-right: 0;
- @media (max-width: $screen-sm-max) {
+ @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) {
.issues-filters,
.issues_bulk_update {
@@ -124,7 +131,15 @@
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 {
padding: 0 0 10px;
background-color: $white-light;
@@ -218,4 +233,4 @@
.filter-dropdown-loading {
padding: 8px 16px;
-} \ No newline at end of file
+}
diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss
index 8e2c56a8488..eb73f7cc794 100644
--- a/app/assets/stylesheets/framework/mobile.scss
+++ b/app/assets/stylesheets/framework/mobile.scss
@@ -100,8 +100,7 @@
@media (max-width: $screen-sm-max) {
.issues-filters {
- .milestone-filter,
- .labels-filter {
+ .milestone-filter {
display: none;
}
}
diff --git a/changelogs/unreleased/18962-update-issues-button-jumps.yml b/changelogs/unreleased/18962-update-issues-button-jumps.yml
index d8131dd995d..7be136ac4ff 100644
--- a/changelogs/unreleased/18962-update-issues-button-jumps.yml
+++ b/changelogs/unreleased/18962-update-issues-button-jumps.yml
@@ -1,4 +1,4 @@
---
title: Align bulk update issues button to the right
merge_request:
-author: Félix Baylac-Jacqué
+author: