diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-12 14:27:25 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-12 14:27:25 +0000 |
| commit | 453dec0a575bce9db8df6003f3de62228bec1f53 (patch) | |
| tree | 6ea5bc6dec845416665b261b294d8204061f5c76 | |
| parent | 1eca446671553888782bc709b8af799fd6de1a66 (diff) | |
| parent | df5882eeac771bf0b2df21ddfcc2589309bac495 (diff) | |
| download | gitlab-ce-453dec0a575bce9db8df6003f3de62228bec1f53.tar.gz | |
Merge branch '57551-collapse-board-list-fix' into 'master'
Add flex styles to board list only if board list is expanded
Closes #57551
See merge request gitlab-org/gitlab-ce!25113
| -rw-r--r-- | app/assets/javascripts/boards/components/board_list.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/components/board_list.vue b/app/assets/javascripts/boards/components/board_list.vue index a689dfc3768..f3f341ece5c 100644 --- a/app/assets/javascripts/boards/components/board_list.vue +++ b/app/assets/javascripts/boards/components/board_list.vue @@ -221,7 +221,7 @@ export default { </script> <template> - <div class="board-list-component d-flex flex-column"> + <div class="board-list-component"> <div v-if="loading" class="board-list-loading text-center" aria-label="Loading issues"> <gl-loading-icon /> </div> diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index bc28ffb3a92..a9324ba2ed0 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -164,6 +164,13 @@ display: none; } } + + &:not(.is-collapsed) { + .board-list-component { + display: flex; + flex-direction: column; + } + } } .board-inner { |