You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2023/10/04 10:29:32 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2770] Tree CSS is fixed; commons-dbcp, commons-pool2, commons-io and plugins
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 8e221f8d9 [OPENMEETINGS-2770] Tree CSS is fixed; commons-dbcp, commons-pool2, commons-io and plugins
8e221f8d9 is described below
commit 8e221f8d9a1c5aa87efdc7de908b02a5ce1ae7c3
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Oct 4 17:29:20 2023 +0700
[OPENMEETINGS-2770] Tree CSS is fixed; commons-dbcp, commons-pool2, commons-io and plugins
---
openmeetings-web/src/main/front/src/css/_tree.scss | 75 ++++++++++++----------
pom.xml | 10 +--
2 files changed, 46 insertions(+), 39 deletions(-)
diff --git a/openmeetings-web/src/main/front/src/css/_tree.scss b/openmeetings-web/src/main/front/src/css/_tree.scss
index 6f6cd0783..a1a1aa30f 100644
--- a/openmeetings-web/src/main/front/src/css/_tree.scss
+++ b/openmeetings-web/src/main/front/src/css/_tree.scss
@@ -38,12 +38,50 @@
{
width: 100%;
}
+ .tree-node {
+ .file.item {
+ position: relative;
+ display: inline-block;
+ vertical-align: top;
+
+ .name, .name span {
+ color: black;
+ display: block;
+ /* Required for text-overflow to do anything */
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+ }
+ .name {
+ padding-top: 10px;
+ padding-inline-start: 37px;
+ }
+ .errors {
+ position: absolute;
+ top: 0px;
+ right: 1px;
+ width: 32px;
+ height: 32px;
+ margin: 0px;
+ padding: 0px;
+ }
+ .errors::before {
+ color: var(--bs-warning);
+ content: '\f071';
+ }
+ }
+ .folder .file.item, .folder-open .file.item {
+ .name {
+ padding-inline-start: 2px;
+ }
+ }
+ .om-icon.broken .file.item .name {
+ width: calc(100% - 32px);
+ }
+ }
div.tree-subtree, .tree-node .om-icon {
width: calc(100% - 20px);
}
- .tree-node .om-icon.broken .file.item .name {
- width: calc(100% - 32px);
- }
span.tree-content {
display: flex !important;
}
@@ -185,37 +223,6 @@
.selected .file.item {
background-color: #0099FF;
}
-.file.item {
- position: relative;
- display: inline-block;
- vertical-align: top;
-
- .name, .name span {
- color: black;
- display: block;
- /* Required for text-overflow to do anything */
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- }
- .name {
- padding-top: 10px;
- padding-inline-start: 5px;
- }
- .errors::before {
- color: var(--bs-warning);
- content: '\f071';
- }
-}
-.tree-node .file.item .errors {
- position: absolute;
- top: 0px;
- right: 1px;
- width: 32px;
- height: 32px;
- margin: 0px;
- padding: 0px;
-}
.dialog.errors {
height: 500px;
font-size: small;
diff --git a/pom.xml b/pom.xml
index 4635577dc..2bdecef04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<version.maven-javadoc-plugin>3.6.0</version.maven-javadoc-plugin>
<version.maven-surefire>3.1.2</version.maven-surefire>
<version.maven-site-plugin>4.0.0-M9</version.maven-site-plugin>
- <version.maven-enforcer-plugin>3.3.0</version.maven-enforcer-plugin>
+ <version.maven-enforcer-plugin>3.4.1</version.maven-enforcer-plugin>
<version.maven-source-plugin>3.3.0</version.maven-source-plugin>
<version.maven-compiler-plugin>3.11.0</version.maven-compiler-plugin>
<version.maven-project-info-reports-plugin>3.4.5</version.maven-project-info-reports-plugin>
@@ -77,7 +77,7 @@
<maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version>
<sonar-maven-plugin.version>3.10.0.2594</sonar-maven-plugin.version>
<jacoco-maven-plugin.versoin>0.8.10</jacoco-maven-plugin.versoin>
- <forbiddenapis.version>3.5.1</forbiddenapis.version>
+ <forbiddenapis.version>3.6</forbiddenapis.version>
<frontend-maven-plugin.version>1.14.0</frontend-maven-plugin.version>
<swagger-plugin.version>2.1.6</swagger-plugin.version>
<plexus-utils.version>3.5.1</plexus-utils.version>
@@ -103,11 +103,11 @@
<openjpa.version>3.2.2</openjpa.version>
<asterisk-java.version>3.39.0</asterisk-java.version>
<commons-lang3.version>3.13.0</commons-lang3.version>
- <commons-dbcp.version>2.9.0</commons-dbcp.version>
- <commons-pool2.version>2.11.1</commons-pool2.version>
+ <commons-dbcp.version>2.10.0</commons-dbcp.version>
+ <commons-pool2.version>2.12.0</commons-pool2.version>
<commons-cli.version>1.5.0</commons-cli.version>
<commons-codec.version>1.16.0</commons-codec.version>
- <commons-io.version>2.13.0</commons-io.version>
+ <commons-io.version>2.14.0</commons-io.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-text.version>1.10.0</commons-text.version>
<commons-net.version>3.9.0</commons-net.version>