Commit 45420e3e authored by Winnie Hellmann's avatar Winnie Hellmann

Remove duplicate scroll bar from issue board switcher

parent b9d07743
...@@ -217,6 +217,7 @@ export default { ...@@ -217,6 +217,7 @@ export default {
<span class="boards-selector-wrapper js-boards-selector-wrapper"> <span class="boards-selector-wrapper js-boards-selector-wrapper">
<gl-dropdown <gl-dropdown
toggle-class="dropdown-menu-toggle js-dropdown-toggle" toggle-class="dropdown-menu-toggle js-dropdown-toggle"
menu-class="flex-column"
:text="board.name" :text="board.name"
@show="loadBoards" @show="loadBoards"
> >
...@@ -230,38 +231,42 @@ export default { ...@@ -230,38 +231,42 @@ export default {
<gl-search-box v-if="!loading" ref="searchBox" v-model="filterTerm" /> <gl-search-box v-if="!loading" ref="searchBox" v-model="filterTerm" />
</gl-dropdown-header> </gl-dropdown-header>
<div class="dropdown-content-faded-mask js-scroll-fade" :class="scrollFadeClass"> <div
<div v-if="!loading"
v-if="!loading" ref="content"
ref="content" class="dropdown-content flex-fill"
class="dropdown-list js-dropdown-list" @scroll.passive="throttledSetScrollFade"
@scroll.passive="throttledSetScrollFade" >
<gl-dropdown-item
v-show="filteredBoards.length === 0"
class="no-pointer-events text-secondary"
> >
<gl-dropdown-item {{ s__('IssueBoards|No matching boards found') }}
v-show="filteredBoards.length === 0" </gl-dropdown-item>
class="no-pointer-events text-secondary"
>
{{ s__('IssueBoards|No matching boards found') }}
</gl-dropdown-item>
<gl-dropdown-item <gl-dropdown-item
v-for="otherBoard in filteredBoards" v-for="otherBoard in filteredBoards"
:key="otherBoard.id" :key="otherBoard.id"
class="js-dropdown-item" class="js-dropdown-item"
:href="`${boardBaseUrl}/${otherBoard.id}`" :href="`${boardBaseUrl}/${otherBoard.id}`"
> >
{{ otherBoard.name }} {{ otherBoard.name }}
</gl-dropdown-item> </gl-dropdown-item>
<gl-dropdown-item v-if="hasMissingBoards" class="small unclickable"> <gl-dropdown-item v-if="hasMissingBoards" class="small unclickable">
{{ {{
s__( s__(
'IssueBoards|Some of your boards are hidden, activate a license to see them again.', 'IssueBoards|Some of your boards are hidden, activate a license to see them again.',
) )
}} }}
</gl-dropdown-item> </gl-dropdown-item>
</div>
</div> </div>
<div
v-show="filteredBoards.length > 0"
class="dropdown-content-faded-mask"
:class="scrollFadeClass"
></div>
<gl-loading-icon v-if="loading" class="dropdown-loading" /> <gl-loading-icon v-if="loading" class="dropdown-loading" />
<div v-if="canAdminBoard"> <div v-if="canAdminBoard">
......
...@@ -104,10 +104,10 @@ ...@@ -104,10 +104,10 @@
} }
.boards-switcher { .boards-switcher {
.dropdown-content-faded-mask .dropdown-list { .dropdown-menu.show {
// the following is no longer necessary after https://gitlab.com/gitlab-org/gitlab-ee/issues/8855 // we cannot use d-flex from Bootstrap because of !important
$search-box-height: 50px; // see https://gitlab.com/gitlab-org/gitlab-ui/issues/38
max-height: calc(#{$dropdown-max-height} - #{$search-box-height}); display: flex;
} }
// the following is a workaround until we have it fixed in gitlab-ui // the following is a workaround until we have it fixed in gitlab-ui
......
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