diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-01-28 12:00:55 +0100 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-01-28 15:33:47 +0100 |
| commit | 7cc185ac57c77be85178f92b1d01d46e20218948 (patch) | |
| tree | 3162f535c596952fbe411a2959435ab09ce9cf49 /client | |
| parent | 4d37e1d6406491ec74594c0c7094ccdd554fc55e (diff) | |
| download | wekan-7cc185ac57c77be85178f92b1d01d46e20218948.tar.gz wekan-7cc185ac57c77be85178f92b1d01d46e20218948.tar.bz2 wekan-7cc185ac57c77be85178f92b1d01d46e20218948.zip | |
Properly fix horizontal rendering on Chrome and Firefox
This reverts commit 74cf9e2573 "- Fix Firefox left-rigth scrollbar."
This reverts commit 9dd8216dfb.
"- Fix cards below swimlane title in Firefox by making
[previous fix](https://github.com/wekan/wekan/pull/2132/commits/f7c6b7fce237a6dbdbbd6d728cfb11ad3f4378eb)"
And this partially reverts commit dd88eb4cc
The root of the issue was that I was adding a new div and nesting
the list of lists in this new list. This resulted in some
weird behavior that Firefox could not handled properly
Revert to a code colser to v2.02, by just having the
swimlane header in a separate line, and keep only one
flex element.
fixes #2137
Diffstat (limited to 'client')
| -rw-r--r-- | client/components/swimlanes/swimlanes.jade | 26 | ||||
| -rw-r--r-- | client/components/swimlanes/swimlanes.styl | 15 |
2 files changed, 15 insertions, 26 deletions
diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index ad61466e..34177a02 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -1,22 +1,22 @@ template(name="swimlane") - .swimlane.js-lists.js-swimlane + .swimlane +swimlaneHeader - .swimlane.list-group.js-lists - if isMiniScreen - if currentList - +list(currentList) - else - each currentBoard.lists - +miniList(this) - if currentUser.isBoardMember - +addListForm + .swimlane.js-lists.js-swimlane + if isMiniScreen + if currentList + +list(currentList) else each currentBoard.lists - +list(this) - if currentCardIsInThisList _id ../_id - +cardDetails(currentCard) + +miniList(this) if currentUser.isBoardMember +addListForm + else + each currentBoard.lists + +list(this) + if currentCardIsInThisList _id ../_id + +cardDetails(currentCard) + if currentUser.isBoardMember + +addListForm template(name="listsGroup") .swimlane.list-group.js-lists diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl index 9abf2820..406fe1d3 100644 --- a/client/components/swimlanes/swimlanes.styl +++ b/client/components/swimlanes/swimlanes.styl @@ -5,7 +5,7 @@ // transparent, because that won't work during a swimlane drag. background: darken(white, 13%) display: flex - flex-direction: column + flex-direction: row overflow: 0; max-height: 100% @@ -27,7 +27,7 @@ .swimlane-header-wrap display: flex; flex-direction: row; - flex: 0 0 24px; + flex: 1 0 100%; background-color: #ccc; .swimlane-header @@ -51,19 +51,8 @@ margin-right: 10px .list-group - flex-direction: row height: 100% -// Firefox fix for cards behind swimlane to overflow-y -// https://github.com/wekan/wekan/pull/2132/commits/f7c6b7fce237a6dbdbbd6d728cfb11ad3f4378eb -// and enable Firefox left-right scroll https://github.com/wekan/wekan/issues/2137 -@-moz-document url-prefix() { - .list-group { - overflow-y: hidden; - overflow: -moz-scrollbars-vertical; - } -} - swimlane-color(background, color...) background: background !important if color |