Commit cf4e8395 authored by Phil Hughes's avatar Phil Hughes

Repositioned multiple issue boards selector

Closes #1156
parent ae623857
...@@ -35,7 +35,6 @@ $(() => { ...@@ -35,7 +35,6 @@ $(() => {
el: $boardApp, el: $boardApp,
components: { components: {
'board': gl.issueBoards.Board, 'board': gl.issueBoards.Board,
'boards-selector': gl.issueBoards.BoardsSelector,
'board-sidebar': gl.issueBoards.BoardSidebar, 'board-sidebar': gl.issueBoards.BoardSidebar,
'board-add-issues-modal': gl.issueBoards.IssuesModal, 'board-add-issues-modal': gl.issueBoards.IssuesModal,
}, },
...@@ -110,4 +109,11 @@ $(() => { ...@@ -110,4 +109,11 @@ $(() => {
</button> </button>
`, `,
}); });
gl.IssueboardsSwitcher = new Vue({
el: '#js-multiple-boards-switcher',
components: {
'boards-selector': gl.issueBoards.BoardsSelector,
}
});
}); });
...@@ -49,6 +49,15 @@ ...@@ -49,6 +49,15 @@
.page-with-sidebar { .page-with-sidebar {
padding-bottom: 0; padding-bottom: 0;
} }
.issues-details-filters {
display: -webkit-flex;
display: flex;
}
.filter-form {
width: 100%;
}
} }
.boards-app { .boards-app {
...@@ -63,6 +72,7 @@ ...@@ -63,6 +72,7 @@
.boards-list { .boards-list {
height: calc(100vh - 152px); height: calc(100vh - 152px);
width: 100%; width: 100%;
padding-top: 25px;
padding-bottom: 25px; padding-bottom: 25px;
padding-right: ($gl-padding / 2); padding-right: ($gl-padding / 2);
padding-left: ($gl-padding / 2); padding-left: ($gl-padding / 2);
...@@ -70,8 +80,8 @@ ...@@ -70,8 +80,8 @@
white-space: nowrap; white-space: nowrap;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
height: 409px; // Needed for PhantomJS height: 475px; // Needed for PhantomJS
height: calc(100vh - 290px); height: calc(100vh - 220px);
min-height: 409px; min-height: 409px;
transition: width .2s; transition: width .2s;
...@@ -304,21 +314,6 @@ ...@@ -304,21 +314,6 @@
} }
} }
.boards-switcher {
padding: 0;
border: 0;
outline: 0;
background: none;
font-size: 19px;
font-weight: 600;
> .fa {
position: relative;
top: 2px;
margin-left: 5px;
}
}
.board-selector-page-two { .board-selector-page-two {
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
...@@ -534,6 +529,12 @@ ...@@ -534,6 +529,12 @@
font-size: 9px; font-size: 9px;
line-height: 15px; line-height: 15px;
border-radius: 50%; border-radius: 50%;
}
.issue-boards-switcher {
padding-right: 10px;
margin-right: 10px;
border-right: 1px solid $white-dark;
} }
.modal-filters { .modal-filters {
......
...@@ -13,10 +13,9 @@ ...@@ -13,10 +13,9 @@
= render "projects/issues/head" = render "projects/issues/head"
= render 'shared/issuable/filter', type: :boards = render 'shared/issuable/filter', type: :boards, board: board
#board-app.boards-app{ "v-cloak" => true, data: board_data } #board-app.boards-app{ "v-cloak" => true, data: board_data }
= render "title", board: board
.boards-list{ ":class" => "{ 'is-compact': detailIssueVisible }" } .boards-list{ ":class" => "{ 'is-compact': detailIssueVisible }" }
.boards-app-loading.text-center{ "v-if" => "loading" } .boards-app-loading.text-center{ "v-if" => "loading" }
= icon("spinner spin") = icon("spinner spin")
......
%boards-selector{ "inline-template" => true, %boards-selector{ "inline-template" => true,
":current-board" => board.to_json } ":current-board" => board.to_json }
.boards-title-holder.dropdown .dropdown
%button.boards-switcher{ "@click" => "loadBoards", %button.dropdown-menu-toggle{ "@click" => "loadBoards",
data: { toggle: "dropdown" } } data: { toggle: "dropdown" } }
{{ board.name }} {{ board.name }}
= icon("caret-down") = icon("chevron-down")
.dropdown-menu{ ":class" => "{ 'is-loading': loading }" } .dropdown-menu{ ":class" => "{ 'is-loading': loading }" }
.dropdown-title .dropdown-title
%button.dropdown-title-button.dropdown-menu-back{ type: "button", %button.dropdown-title-button.dropdown-menu-back{ type: "button",
......
- finder = controller.controller_name == 'issues' || controller.controller_name == 'boards' ? issues_finder : merge_requests_finder - finder = controller.controller_name == 'issues' || controller.controller_name == 'boards' ? issues_finder : merge_requests_finder
- boards_page = controller.controller_name == 'boards' - boards_page = controller.controller_name == 'boards'
- board = local_assigns.fetch(:board, nil)
.issues-filters .issues-filters
.issues-details-filters.row-content-block.second-block .issues-details-filters.row-content-block.second-block
- if boards_page && board
#js-multiple-boards-switcher.filter-item.inline.issue-boards-switcher{ "v-cloak" => true }
= render "projects/boards/switcher", board: board
= form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name, :search]), method: :get, class: 'filter-form js-filter-form' do = form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name, :search]), method: :get, class: 'filter-form js-filter-form' do
- if params[:search].present? - if params[:search].present?
= hidden_field_tag :search, params[:search] = hidden_field_tag :search, params[:search]
......
---
title: Repositioned multiple issue boards selector
merge_request:
author:
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