Skip to content

Commit

Permalink
Properly fix horizontal rendering on Chrome and Firefox
Browse files Browse the repository at this point in the history
This reverts commit 74cf9e2 "- Fix Firefox left-rigth scrollbar."

This reverts commit 9dd8216.
"- Fix cards below swimlane title in Firefox by making
[previous fix](f7c6b7f)"

And this partially reverts commit dd88eb4

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
  • Loading branch information
bentiss committed Jan 28, 2019
1 parent 4d37e1d commit 7cc185a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 26 deletions.
26 changes: 13 additions & 13 deletions 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
Expand Down
15 changes: 2 additions & 13 deletions client/components/swimlanes/swimlanes.styl
Expand Up @@ -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%

Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 7cc185a

Please sign in to comment.