diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-07-06 14:17:06 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-07-06 14:17:06 +0000 |
| commit | 3033e019247a599bcf22167c04e7bc41211cbe90 (patch) | |
| tree | 33ff95ed1f076c6ecc5099d4f74a9be2fa591436 | |
| parent | 89665b30dd957dc520b95bf3c9833e8b545d75d2 (diff) | |
| parent | 9d87ace5be56deb7f0e4c4e5f4af06d70d4b6da1 (diff) | |
| download | gitlab-ce-3033e019247a599bcf22167c04e7bc41211cbe90.tar.gz | |
Merge branch 'revert-e76b176d' into 'master'
Revert "Merge branch 'rosulk-patch-12' into 'master'"
See merge request gitlab-org/gitlab-ce!20428
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 11 | ||||
| -rw-r--r-- | changelogs/unreleased/rosulk-patch-12.yml | 5 |
2 files changed, 5 insertions, 11 deletions
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 750d2c8b990..5de53892fac 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -80,7 +80,6 @@ overflow-x: scroll; white-space: nowrap; min-height: 200px; - display: flex; @include media-breakpoint-only(sm) { height: calc(100vh - #{$issue-board-list-difference-sm}); @@ -111,15 +110,17 @@ .board { display: inline-block; - flex: 1; - min-width: 300px; - max-width: 400px; + width: calc(85vw - 15px); height: 100%; padding-right: ($gl-padding / 2); padding-left: ($gl-padding / 2); white-space: normal; vertical-align: top; + @include media-breakpoint-up(sm) { + width: 400px; + } + &.is-expandable { .board-header { cursor: pointer; @@ -127,8 +128,6 @@ } &.is-collapsed { - flex: none; - min-width: 0; width: 50px; .board-header { diff --git a/changelogs/unreleased/rosulk-patch-12.yml b/changelogs/unreleased/rosulk-patch-12.yml deleted file mode 100644 index 9637c88d1a4..00000000000 --- a/changelogs/unreleased/rosulk-patch-12.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Flex issue board columns -merge_request: 19250 -author: Roman Rosluk -type: changed |