summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-03-17 21:45:08 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-03-17 21:45:08 +0000
commit1ffb32ed613129271c7668385fce4024292ca4ec (patch)
treecd072ba9058ffc381d7613b413648735c1ac986d
parent7562375e6f1aa42a43152455200e352a9e920f4f (diff)
parentfeb538dddd5e2e6b09860d34b4a17c3e46a006c8 (diff)
downloadgitlab-ce-1ffb32ed613129271c7668385fce4024292ca4ec.tar.gz
Merge branch 'filter-spacing' into 'master'
Fixed filter spacing Closes #14350 ![Screen_Shot_2016-03-17_at_10.21.33](/uploads/5b8f39134cc90ce1dd6565f665a39838/Screen_Shot_2016-03-17_at_10.21.33.png) See merge request !3267
-rw-r--r--app/assets/stylesheets/framework/filters.scss17
1 files changed, 3 insertions, 14 deletions
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss
index c431e2b0df3..40a508c1ebc 100644
--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -3,22 +3,11 @@
vertical-align: top;
}
-@media (min-width: 800px) {
+@media (min-width: $screen-sm-min) {
.issues-filters,
.issues_bulk_update {
- select, .select2-container {
- width: 120px !important;
- display: inline-block;
- }
- }
-}
-
-@media (min-width: 1200px) {
- .issues-filters,
- .issues_bulk_update {
- select, .select2-container {
- width: 150px !important;
- display: inline-block;
+ .dropdown-menu-toggle {
+ width: 132px;
}
}
}