This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 5abff9397 [OPENMEETINGS-2802] various file-tree UI issues are fixed;
fontawesome icons are fixed
5abff9397 is described below
commit 5abff9397bee08c64525152355e3022152d46342
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sat Oct 4 15:01:15 2025 +0700
[OPENMEETINGS-2802] various file-tree UI issues are fixed; fontawesome
icons are fixed
---
openmeetings-web/src/main/front/src/css/_admin.scss | 2 +-
openmeetings-web/src/main/front/src/css/_calendar.scss | 2 +-
openmeetings-web/src/main/front/src/css/_general.scss | 4 ++--
openmeetings-web/src/main/front/src/css/_room.scss | 2 +-
openmeetings-web/src/main/front/src/css/_tree.scss | 5 +++--
openmeetings-web/src/main/front/src/css/_wb.scss | 2 +-
openmeetings-web/src/main/front/src/room/room.js | 4 ++--
.../java/org/apache/openmeetings/web/common/tree/FolderPanel.java | 5 +++--
.../src/main/java/org/apache/openmeetings/web/room/RoomPanel.html | 4 ++--
.../java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html | 2 +-
.../src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 2 +-
.../src/main/java/org/apache/openmeetings/web/user/chat/Chat.html | 2 +-
.../java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java | 2 +-
13 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/openmeetings-web/src/main/front/src/css/_admin.scss
b/openmeetings-web/src/main/front/src/css/_admin.scss
index 532b31f45..e5a429e07 100644
--- a/openmeetings-web/src/main/front/src/css/_admin.scss
+++ b/openmeetings-web/src/main/front/src/css/_admin.scss
@@ -75,7 +75,7 @@
margin: 0;
&::before {
- font-family: 'Font Awesome 6 Free';
+ font-family: 'Font Awesome 7 Free';
font-weight: 900;
font-size: 2.2em;
}
diff --git a/openmeetings-web/src/main/front/src/css/_calendar.scss
b/openmeetings-web/src/main/front/src/css/_calendar.scss
index 77b5aa29c..3b8517482 100644
--- a/openmeetings-web/src/main/front/src/css/_calendar.scss
+++ b/openmeetings-web/src/main/front/src/css/_calendar.scss
@@ -1,6 +1,6 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
#contents #calendar .fc-gotoBtn-button::before {
- font-family: 'Font Awesome 6 Free';
+ font-family: 'Font Awesome 7 Free';
font-weight: 900;
content: "\f133";
font-size: 1em;
diff --git a/openmeetings-web/src/main/front/src/css/_general.scss
b/openmeetings-web/src/main/front/src/css/_general.scss
index 488ecaa6d..1d6a978b8 100644
--- a/openmeetings-web/src/main/front/src/css/_general.scss
+++ b/openmeetings-web/src/main/front/src/css/_general.scss
@@ -180,7 +180,7 @@ html, body {
}
}
&::before {
- font-family: 'Font Awesome 6 Free';
+ font-family: 'Font Awesome 7 Free';
font-weight: 900;
color: var(--bs-secondary);
font-size: 1.2em;
@@ -524,7 +524,7 @@ table.messages {
height: 100%;
}
.dragbox .dragbox-header .dragbox-toggle, .dragbox .dragbox-header
.dragbox-actions .icon, .sort-icon a {
- font-family: "Font Awesome 6 Free";
+ font-family: "Font Awesome 7 Free";
font-weight: 900;
display: inline-block;
font-style: normal;
diff --git a/openmeetings-web/src/main/front/src/css/_room.scss
b/openmeetings-web/src/main/front/src/css/_room.scss
index 9531d94fa..90c783316 100644
--- a/openmeetings-web/src/main/front/src/css/_room.scss
+++ b/openmeetings-web/src/main/front/src/css/_room.scss
@@ -98,7 +98,7 @@
vertical-align: top;
}
.label {
- width: calc((var(--sidebar-width) - 50px) / 2 -
40px);
+ width: calc((var(--sidebar-width) - 50px) / 2 -
42px);
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/openmeetings-web/src/main/front/src/css/_tree.scss
b/openmeetings-web/src/main/front/src/css/_tree.scss
index 533e49249..9bad6ba57 100644
--- a/openmeetings-web/src/main/front/src/css/_tree.scss
+++ b/openmeetings-web/src/main/front/src/css/_tree.scss
@@ -16,7 +16,8 @@
width: 2px;
}
.om-icon.active {
- background-color: var(--bs-info);
+ --bs-bg-opacity: 0.5;
+ background-color: rgba(var(--bs-info-rgb),
var(--bs-bg-opacity));
}
.om-icon i {
display: none;
@@ -157,7 +158,7 @@
display: none !important;
}
}
-.trash-toolbar-hover {
+.trash-toolbar.ui-droppable-hover {
color: inherit;
background-color: var(--bs-light);
diff --git a/openmeetings-web/src/main/front/src/css/_wb.scss
b/openmeetings-web/src/main/front/src/css/_wb.scss
index 70499fa91..0d0850173 100644
--- a/openmeetings-web/src/main/front/src/css/_wb.scss
+++ b/openmeetings-web/src/main/front/src/css/_wb.scss
@@ -19,7 +19,7 @@
background-position: center;
&::before {
- font-family: 'Font Awesome 6 Free';
+ font-family: 'Font Awesome 7 Free';
font-weight: 400;
font-size: 20em;
content: '\f358';
diff --git a/openmeetings-web/src/main/front/src/room/room.js
b/openmeetings-web/src/main/front/src/room/room.js
index 376bb9731..99af199bc 100644
--- a/openmeetings-web/src/main/front/src/room/room.js
+++ b/openmeetings-web/src/main/front/src/room/room.js
@@ -52,12 +52,12 @@ function __dockSetMode(mode) {
if (mode) {
icon.addClass('icon-undock');
dock.attr('title', dock.data('ttl-undock'))
- .find('.sr-only').text(dock.data('ttl-undock'));
+ .find('.visually-hidden').text(dock.data('ttl-undock'));
_sbAddResizable();
} else {
icon.addClass('icon-dock');
dock.attr('title', dock.data('ttl-dock'))
- .find('.sr-only').text(dock.data('ttl-dock'));
+ .find('.visually-hidden').text(dock.data('ttl-dock'));
sb.addClass('closed').resizable('destroy');
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
index b2f0a38f9..68584307d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
@@ -57,7 +57,8 @@ import jakarta.inject.Inject;
public class FolderPanel extends Panel implements IDraggableListener,
IDroppableListener {
private static final long serialVersionUID = 1L;
- private static final String CSS_CLASS_FILE = "file ps-5 ";
+ private static final String CSS_CLASS_PS5 = "ps-5 ";
+ private static final String CSS_CLASS_FILE = "file " + CSS_CLASS_PS5;
private static final String PARAM_MOD = "mod";
private static final String PARAM_SHIFT = "s";
private static final String PARAM_CTRL = "c";
@@ -234,7 +235,7 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
private static final long serialVersionUID = 1L;
private void setVideoStyle(final BaseFileItem f, StringBuilder
style) {
- style.append("recording ");
+ style.append("recording " + CSS_CLASS_PS5);
if (f instanceof Recording rec) {
Status st = rec.getStatus();
if (Status.RECORDING == st || Status.CONVERTING
== st) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
index 2bcefb29e..49d344d65 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
@@ -106,14 +106,14 @@
<div id="video-button-bar" class="buttonpane float-end
position-absolute top-0 end-0">
<a class="btn btn-refresh btn-outline-secondary btn-sm"
href="#" wicket:message="title:lbl.refresh" role="button">
<i class="fas fa-sync-alt"></i>
- <span class="sr-only"><wicket:message
key="lbl.refresh"/></span>
+ <span class="visually-hidden"><wicket:message
key="lbl.refresh"/></span>
</a>
<a class="btn btn-toggle btn-outline-secondary btn-sm"
href="#" role="button">
<i class="fas"></i>
</a>
<a class="btn btn-wclose btn-outline-secondary btn-sm"
href="#" wicket:message="title:85" role="button">
<i class="fas fa-times"></i>
- <span class="sr-only"><wicket:message
key="85"/></span>
+ <span class="visually-hidden"><wicket:message
key="85"/></span>
</a>
</div>
<div id="muteothers-confirm"
wicket:message="title:ulist.right.muteothers.grant, data-btn-ok:54,
data-btn-cancel:lbl.cancel">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
index 2640970f7..62a37b3b8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
@@ -37,7 +37,7 @@
</li>
<li class="btn-dock btn btn-outline-secondary end-0"
wicket:message="data-ttl-dock:label.dock.panel,data-ttl-undock:label.undock.panel">
<i class="fas"></i>
- <span class="sr-only"></span>
+ <span class="visually-hidden"></span>
</li>
</ul>
<div class="tab-content">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index a795fb925..dd8b069c8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -56,7 +56,7 @@
data-btn-ok-icon-class="fas
fa-exclamation-triangle"
>
<i class="fas fa-times"></i>
- <span class="sr-only"><wicket:message key="85"/></span>
+ <span class="visually-hidden"><wicket:message
key="85"/></span>
</button>
<div id="wb-area-texts" class="btn-group texts dropstart">
<a class="dropdown-toggle"
data-bs-toggle="dropdown"></a>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
index 52f67c3d0..3e9314b72 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
@@ -55,7 +55,7 @@
<div id="chat-actions-accept-template" class='accept clickable'
wicket:message="title:1190"><i class="fas fa-check"></i></div>
<button id="chat-close-block" class="btn btn-sm
btn-outline-secondary close-chat" wicket:message="title:85">
<i class="fas fa-times"></i>
- <span class="sr-only"><wicket:message key="85"/></span>
+ <span class="visually-hidden"><wicket:message
key="85"/></span>
</button>
<div id="chat-msg-area-template" class="messageArea bg-white
tab-pane h-100"></div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
index fdab17da1..59a2efcf2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
@@ -91,7 +91,7 @@ public class RoomListPanel extends Panel {
@Override
protected <L extends Serializable> Component
newLabel(String markupId, IModel<L> model) {
- return super.newLabel(markupId,
model).setRenderBodyOnly(false).add(new CssClassNameAppender("sr-only"));
+ return super.newLabel(markupId,
model).setRenderBodyOnly(false).add(new
CssClassNameAppender("visually-hidden"));
}
@Override
