From 98b3f7c8c95b1eee2978fbda243de9dd0141b77e Mon Sep 17 00:00:00 2001 From: DanyLE Date: Fri, 16 Dec 2022 19:42:42 +0100 Subject: [PATCH] Improve Firefox support + fix list view drag and drop bug --- src/core/tags/ListViewTag.ts | 9 ++++----- src/themes/antos_dark/afx-slider.css | 5 +++-- src/themes/antos_light/afx-slider.css | 5 +++-- src/themes/system/afx-slider.css | 9 +++++++-- src/themes/system/antos.css | 5 +++++ 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/core/tags/ListViewTag.ts b/src/core/tags/ListViewTag.ts index 9e4ebd2..fa1a4af 100644 --- a/src/core/tags/ListViewTag.ts +++ b/src/core/tags/ListViewTag.ts @@ -172,7 +172,6 @@ namespace OS { * @memberof ListViewItemTag */ protected mount(): void { - $(this.refs.item).attr("dataref", "afx-list-item"); $(this).addClass("afx-list-item"); $(this.refs.item).on("contextmenu", (e) => { this._onctxmenu({ id: this.aid, data: this }); @@ -1173,12 +1172,12 @@ namespace OS { return; } let el: any = $(e.target).closest( - "li[dataref='afx-list-item']" + `[list-id='${this.aid}']` ); if (el.length === 0) { return; } - el = el.parent()[0]; + el = el[0]; if(!this.selectedItems.includes(el)) { return; @@ -1194,12 +1193,12 @@ namespace OS { $(window).off("mousemove", this._onmousemove); $("#systooltip").hide(); let el: any = $(e.target).closest( - "li[dataref='afx-list-item']" + `[list-id='${this.aid}']` ); if (el.length === 0) { return; } - el = el.parent()[0]; + el = el[0]; if (this._dnd.from.includes(el)) { return; } diff --git a/src/themes/antos_dark/afx-slider.css b/src/themes/antos_dark/afx-slider.css index 7877104..0bfcab3 100644 --- a/src/themes/antos_dark/afx-slider.css +++ b/src/themes/antos_dark/afx-slider.css @@ -1,7 +1,6 @@ afx-slider div.container{ border-radius: 3px; - height: 10px; background-color: #868686; } @@ -20,9 +19,11 @@ afx-slider div.dragpoint::before content: "\f0d7"; font-family: "FontAwesome"; position: absolute; - bottom: -9px; left: 0; right: 0; text-align: center; color:#868686; + bottom: -15px; + display: block; + height: 20px; } diff --git a/src/themes/antos_light/afx-slider.css b/src/themes/antos_light/afx-slider.css index c4e5a20..6f17aa9 100644 --- a/src/themes/antos_light/afx-slider.css +++ b/src/themes/antos_light/afx-slider.css @@ -1,7 +1,6 @@ afx-slider div.container{ border-radius: 3px; - height: 5px; background-color: #e6e6e6; } @@ -20,9 +19,11 @@ afx-slider div.dragpoint::before content: "\f0d7"; font-family: "FontAwesome"; position: absolute; - bottom: -9px; left: 0; right: 0; text-align: center; color:#868686; + bottom: -15px; + display: block; + height: 20px; } diff --git a/src/themes/system/afx-slider.css b/src/themes/system/afx-slider.css index 1723a74..dce5973 100644 --- a/src/themes/system/afx-slider.css +++ b/src/themes/system/afx-slider.css @@ -9,6 +9,7 @@ afx-slider div.container{ position: relative; padding:0; cursor: pointer; + height: 10px; } afx-slider div.progress { @@ -19,6 +20,10 @@ afx-slider div.progress { } afx-slider div.dragpoint { - display: block; - padding: 5px; + height: 23px; + display: flex; + flex-direction: column; + justify-content: center; + padding-left: 5px; + padding-right: 5px; } diff --git a/src/themes/system/antos.css b/src/themes/system/antos.css index 5ed7d6b..6d48fab 100644 --- a/src/themes/system/antos.css +++ b/src/themes/system/antos.css @@ -145,8 +145,13 @@ textarea { background-color: #464646; color: white; border-radius: 3px; + margin: 0; font-family: "Ubuntu"; } +button { + font-size: 14px; + margin: 0; +} #login_error { color:chocolate; font-weight: normal;