github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-20 12:07:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix 6.93 with brackground image breaks scrolling on lists within swimlanes.

Browse source 
Thanks to xet7 !

Fixes #4936
This commit is contained in:
Lauri Ojansivu 2023-06-03 20:38:03 -04:00
parent 4405693b1f
commit 04aaa6f30c
3 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/components/sidebar/sidebar.js
View file

@ -694,9 +694,8 @@ BlazeComponent.extendComponent({
'click .js-remove-background-image'() {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
currentBoard.setBackgroundImageURL("");
Utils.setBackgroundImage("");
Popup.back();
//Utils.reload();
Utils.reload();
event.preventDefault();
},
},

3
client/components/swimlanes/swimlanes.css
View file

@ -47,7 +47,8 @@
display: flex;
flex-direction: row;
overflow: 0;
max-height: calc(100% - 26px);
/* max-height: calc(100% - 26px); */
max-height: calc(400px);
}
.swimlane.placeholder {
background-color: rgba(0,0,0,0.2);

23
client/lib/utils.js
View file

@ -1,27 +1,20 @@
Utils = {
setBackgroundImage(url) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
if (url !== currentBoard.backgroundImageURL) {
if (url) {
/*
if(url) {
if (url !== currentBoard.backgroundImageURL) {
currentBoard.setBackgroundImageURL(url);
} else {
currentBoard.setBackgroundImageURL("");
}
}
if (url) {
$(".board-wrapper,.board-wrapper .board-canvas").css({"background":"url(" + url + ")","background-size":"cover"});
$(".minicard").css({"padding":"8px 8px 2px","box-shadow":"0 2px 3px rgba(0, 0, 0, 0.37)"});
$(".minicard .minicard-members,.minicard .minicard-assignees,.minicard .minicard-creator").css({"margin": "12px -0px 0px 5px"});
$(".list").css({"margin":"8px","height":"fit-content","border-left":"none","border-radius":"3px"});
$(".list-header-add").css({"padding":"10px 12px 4px"});
$(".list-header").css({"padding":"15px 12px 4px","border-top-left-radius":"3px","border-top-right-radius":"3px"});
$(".list-header .list-header-name").css({"font-size":"15px","line-height":"15px"});
$(".list-header .list-header-menu").css({"padding":"none"});
$("#header #header-main-bar .board-header-btn").css({"padding":"2px","margin":"0 5px"});
$(".swimlane").css({"background":"none"});
$(".board-canvas").css({"background":"none"});
*/
if (currentBoard.backgroundImageURL) {
$(".board-wrapper,.board-wrapper .board-canvas").css({"background":"url(" + currentBoard.backgroundImageURL + ")","background-size":"cover"});
$(".swimlane,.swimlane .list,.swimlane .list .list-body,.swimlane .list:first-child .list-body").css({"background-color":"transparent"});
} else {
$(".board-wrapper,.board-wrapper .board-canvas").css({"background": currentBoard.background.color});
$(".board-wrapper,.board-wrapper .board-canvas").css({"background": currentBoard.background-color});
}
},
/** returns the current board id