From 78fbee00db5a3b409cd97ea12b9966264df2eb23 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Tue, 31 Jan 2017 07:59:30 -0600
Subject: Make dropdowns smaller on bulk assign issues

---
 app/assets/stylesheets/framework/filters.scss       | 21 ++++++++++++++++++---
 app/assets/stylesheets/framework/mobile.scss        |  3 +--
 .../unreleased/18962-update-issues-button-jumps.yml |  2 +-
 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:
-- 
cgit v1.2.1