Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-25 17:34:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Resolve merge conflicts by accepting PR #6131 changes

Browse source 
Co-authored-by: xet7 <15545+xet7@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-02-07 16:30:08 +00:00
parent dc0b68ee80
commit 97dd5d2064
257 changed files with 9483 additions and 14103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/wekan-accounts-cas/cas_client.js
View file

@ -93,6 +93,8 @@ Meteor.loginWithCas = function(options, callback) {
};
var openCenteredPopup = function(url, width, height) {
// #FIXME screenX and outerWidth are often different units on mobile screen or high DPI
// see https://developer.mozilla.org/en-US/docs/Web/API/Window/devicePixelRatio
var screenX = typeof window.screenX !== 'undefined'
? window.screenX : window.screenLeft;
var screenY = typeof window.screenY !== 'undefined'

4
packages/wekan-fullcalendar/fullcalendar/fullcalendar.css
View file

@ -467,7 +467,7 @@ temporary rendered events).
/* resizer (touch devices) */
.fc-h-event.fc-selected .fc-resizer {
/* 8x8 little dot */
border-radius: 4px;
border-radius: 0.4ch;
border-width: 1px;
width: 6px;
height: 6px;
@ -1145,7 +1145,7 @@ be a descendant of the grid when it is being dragged.
height: 8px;
overflow: hidden;
line-height: 8px;
font-size: 11px;
font-family: monospace;
text-align: center;
cursor: s-resize; }