Commit c29da98f authored by Phil Hughes's avatar Phil Hughes

Merge branch 'mh/boards-filter-bar' into 'master'

Display boards filter bar on mobile

Closes #45864

See merge request gitlab-org/gitlab-ce!30120
parents 39544c73 ce4ab411
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
float: right; float: right;
margin-right: 0; margin-right: 0;
@include media-breakpoint-down(xs) { @include media-breakpoint-down(sm) {
float: none; float: none;
} }
} }
} }
.filters-section { .filters-section {
@include media-breakpoint-down(xs) { @include media-breakpoint-down(sm) {
display: inline-block; display: inline-block;
} }
} }
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
} }
} }
@include media-breakpoint-down(xs) { @include media-breakpoint-down(sm) {
.filter-item { .filter-item {
display: block; display: block;
margin: 0 0 10px; margin: 0 0 10px;
...@@ -50,12 +50,6 @@ ...@@ -50,12 +50,6 @@
} }
.filtered-search-wrapper { .filtered-search-wrapper {
display: flex;
@include media-breakpoint-down(xs) {
flex-direction: column;
}
.tokens-container { .tokens-container {
display: flex; display: flex;
flex: 1; flex: 1;
...@@ -186,7 +180,7 @@ ...@@ -186,7 +180,7 @@
border: 1px solid $border-color; border: 1px solid $border-color;
background-color: $white-light; background-color: $white-light;
@include media-breakpoint-down(xs) { @include media-breakpoint-down(sm) {
flex: 1 1 auto; flex: 1 1 auto;
margin-bottom: 10px; margin-bottom: 10px;
} }
...@@ -259,7 +253,7 @@ ...@@ -259,7 +253,7 @@
max-width: 280px; max-width: 280px;
overflow: auto; overflow: auto;
@include media-breakpoint-down(xs) { @include media-breakpoint-down(sm) {
width: auto; width: auto;
left: 0; left: 0;
right: 0; right: 0;
...@@ -311,7 +305,7 @@ ...@@ -311,7 +305,7 @@
.filtered-search-history-dropdown { .filtered-search-history-dropdown {
width: 40%; width: 40%;
@include media-breakpoint-down(xs) { @include media-breakpoint-down(sm) {
left: 0; left: 0;
right: 0; right: 0;
max-width: none; max-width: none;
...@@ -341,35 +335,46 @@ ...@@ -341,35 +335,46 @@
} }
.filter-dropdown-container { .filter-dropdown-container {
display: flex;
.dropdown-toggle { .dropdown-toggle {
line-height: 22px; line-height: 22px;
} }
} }
@include media-breakpoint-down(xs) { @include media-breakpoint-down(sm) {
.issues-details-filters { .issues-details-filters {
padding: 0 0 10px; padding-top: 0;
padding-bottom: 0;
background-color: $white-light; background-color: $white-light;
border-top: 0; border-top: 0;
} }
.filter-dropdown-container { .boards-switcher {
margin: 0 0 10px;
.boards-selector-wrapper,
.dropdown { .dropdown {
margin-left: 0; display: block;
} }
} }
}
@include media-breakpoint-down(sm) { .filter-dropdown-container > div {
.filter-dropdown-container { margin: 0;
.dropdown-toggle,
.dropdown, > .btn {
.dropdown-menu { margin: 0 0 10px;
width: 100%; width: 100%;
} }
} }
.boards-add-list > .btn {
text-align: left;
> svg {
position: absolute;
top: 11px;
right: 6px;
}
}
} }
.droplab-dropdown .dropdown-menu .filter-dropdown-item { .droplab-dropdown .dropdown-menu .filter-dropdown-item {
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
%script#js-board-promotion{ type: "text/x-template" }= render_if_exists "shared/promotions/promote_issue_board" %script#js-board-promotion{ type: "text/x-template" }= render_if_exists "shared/promotions/promote_issue_board"
#board-app.boards-app.position-relative{ "v-cloak" => "true", data: board_data, ":class" => "{ 'is-compact': detailIssueVisible }" } #board-app.boards-app.position-relative{ "v-cloak" => "true", data: board_data, ":class" => "{ 'is-compact': detailIssueVisible }" }
.d-none.d-sm-none.d-md-block
= render 'shared/issuable/search_bar', type: :boards, board: board = render 'shared/issuable/search_bar', type: :boards, board: board
.boards-list.w-100.py-3.px-2.text-nowrap .boards-list.w-100.py-3.px-2.text-nowrap
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- user_can_admin_list = board && can?(current_user, :admin_list, board.parent) - user_can_admin_list = board && can?(current_user, :admin_list, board.parent)
.issues-filters{ class: ("w-100" if type == :boards_modal) } .issues-filters{ class: ("w-100" if type == :boards_modal) }
.issues-details-filters.filtered-search-block.d-flex{ class: block_css_class, "v-pre" => type == :boards_modal } .issues-details-filters.filtered-search-block.d-flex.flex-column.flex-md-row{ class: block_css_class, "v-pre" => type == :boards_modal }
- if type == :boards - if type == :boards
= render_if_exists "shared/boards/switcher", board: board = render_if_exists "shared/boards/switcher", board: board
= form_tag page_filter_path, method: :get, class: 'filter-form js-filter-form w-100' do = form_tag page_filter_path, method: :get, class: 'filter-form js-filter-form w-100' do
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
- if @can_bulk_update - if @can_bulk_update
.check-all-holder.d-none.d-sm-block.hidden .check-all-holder.d-none.d-sm-block.hidden
= check_box_tag "check-all-issues", nil, false, class: "check-all-issues left" = check_box_tag "check-all-issues", nil, false, class: "check-all-issues left"
.issues-other-filters.filtered-search-wrapper .issues-other-filters.filtered-search-wrapper.d-flex.flex-column.flex-md-row
.filtered-search-box .filtered-search-box
- if type != :boards_modal && type != :boards - if type != :boards_modal && type != :boards
= dropdown_tag(custom_icon('icon_history'), = dropdown_tag(custom_icon('icon_history'),
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
%button.clear-search.hidden{ type: 'button' } %button.clear-search.hidden{ type: 'button' }
= icon('times') = icon('times')
.filter-dropdown-container .filter-dropdown-container.d-flex.flex-column.flex-md-row
- if type == :boards - if type == :boards
.js-board-config{ data: { can_admin_list: user_can_admin_list, has_scope: board.scoped? } } .js-board-config{ data: { can_admin_list: user_can_admin_list, has_scope: board.scoped? } }
- if user_can_admin_list - if user_can_admin_list
......
---
title: Display boards filter bar on mobile
merge_request: 30120
author:
type: fixed
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