diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-20 22:36:35 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-20 22:36:35 +0300 |
| commit | 5bdab11f5ca35cc83b3b55d16d4e1bc0b8408e30 (patch) | |
| tree | 110cf6dbebe0c7209c73dabbff89aab715a8456e | |
| parent | 85759f2c79af60b4903fedfcbc55e6d28979fd1d (diff) | |
| parent | 06c4410948bb0e5a7efd6646e81f221dc3f10f08 (diff) | |
Merge branch 'issue-filter-bar-alignment' into 'master'
Fixed filter bar alignment issues
Closes #29543
See merge request !10049
| -rw-r--r-- | app/assets/stylesheets/framework/filters.scss | 10 | ||||
| -rw-r--r-- | app/views/shared/_sort_dropdown.html.haml | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index 2ebeaf9a40d..569a4c651cc 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -158,8 +158,8 @@ background-color: $white-light; @media (max-width: $screen-xs-min) { - -webkit-flex: 1 1 100%; - flex: 1 1 100%; + -webkit-flex: 1 1 auto; + flex: 1 1 auto; margin-bottom: 10px; .dropdown-menu { @@ -221,6 +221,10 @@ .filter-dropdown-container { display: -webkit-flex; display: flex; + + .dropdown-toggle { + line-height: 22px; + } } .dropdown-menu .filter-dropdown-item { @@ -246,7 +250,9 @@ background-color: $white-light; border-top: 0; } +} +@media (max-width: $screen-xs) { .filter-dropdown-container { .dropdown-toggle, .dropdown { diff --git a/app/views/shared/_sort_dropdown.html.haml b/app/views/shared/_sort_dropdown.html.haml index 367aa550a78..a212c714826 100644 --- a/app/views/shared/_sort_dropdown.html.haml +++ b/app/views/shared/_sort_dropdown.html.haml @@ -1,6 +1,5 @@ .dropdown.inline.prepend-left-10 %button.dropdown-toggle{ type: 'button', data: {toggle: 'dropdown' } } - %span.light - if @sort.present? = sort_options_hash[@sort] - else |