extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 02:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing accidently left conflicts

Browse Source
This commit is contained in:
ralf 2024-08-28 09:44:33 +02:00
parent 5c8c9c841d
commit 0f778d5901
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/js/egw_action/EgwMenuShoelace.ts
View File

@ -117,17 +117,9 @@ export class EgwMenuShoelace extends LitElement
if(this.popup == null)
{
this.popup = Object.assign(document.createElement("sl-popup"), {
<<<<<<< HEAD
placement: "right-start",
autoSize: "vertical",
flip: true,
=======
placement: "bottom-start",
autoSize: "vertical",
flip: true,
flipFallbackPlacements: "top-start",
flipFallbackStrategy: "initial",
>>>>>>> b26c7815b1 (implement new action attribute color, to specify a color for the caption, instead of the default color)
shift: true
});
this.popup.append(this);
@ -140,13 +132,8 @@ export class EgwMenuShoelace extends LitElement
return {
x: _x,
y: _y,
<<<<<<< HEAD
width: 0, // placement="right-start" only works well with 0, not menu.clientWidth,
height: menu.clientHeight,
=======
width: 0, //menu.clientWidth,
height: 0, //menu.clientHeight,
>>>>>>> b26c7815b1 (implement new action attribute color, to specify a color for the caption, instead of the default color)
top: _y,
left: _x,
right: _x,