BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit f1f0531a by Annabel Dunstone Gray Committed by Lin Jen-Shin
Options

Merge branch 'issue-filter-bar-alignment' into 'master'

Fixed filter bar alignment issues Closes #29543 See merge request !10049
parent 50d73ce0
Showing with 13 additions and 3 deletions
app/assets/stylesheets/framework/filters.scss
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,8 @@
max-width: 87%; max-width: 87%;
@media (max-width: $screen-xs-min) { @media (max-width: $screen-xs-min) {
-webkit-flex: 1 1 100%; -webkit-flex: 1 1 auto;
flex: 1 1 100%; flex: 1 1 auto;
margin-bottom: 10px; margin-bottom: 10px;
.dropdown-menu { .dropdown-menu {
...@@ -218,6 +218,15 @@ ...@@ -218,6 +218,15 @@
} }
} }
.filter-dropdown-container {
display: -webkit-flex;
display: flex;
.dropdown-toggle {
line-height: 22px;
}
}
.dropdown-menu .filter-dropdown-item { .dropdown-menu .filter-dropdown-item {
padding: 0; padding: 0;
} }
...@@ -241,7 +250,9 @@ ...@@ -241,7 +250,9 @@
background-color: $white-light; background-color: $white-light;
border-top: 0; border-top: 0;
} }
}
@media (max-width: $screen-xs) {
.filter-dropdown-container { .filter-dropdown-container {
.dropdown-toggle, .dropdown-toggle,
.dropdown { .dropdown {
......
app/views/shared/_sort_dropdown.html.haml
.dropdown.inline.prepend-left-10 .dropdown.inline.prepend-left-10
%button.dropdown-toggle{ type: 'button', data: {toggle: 'dropdown' } } %button.dropdown-toggle{ type: 'button', data: {toggle: 'dropdown' } }
%span.light
- if @sort.present? - if @sort.present?
= sort_options_hash[@sort] = sort_options_hash[@sort]
- else - else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment