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 d4e9b82 [OPENMEETINGS-2497] tree CSS is simplified and fixed for RTL
d4e9b82 is described below
commit d4e9b82716db3bea9440d1382ae0edacfe957f1f
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue Oct 27 23:02:01 2020 +0700
[OPENMEETINGS-2497] tree CSS is simplified and fixed for RTL
---
.../src/main/webapp/css/raw-general-rtl.css | 6 +-
openmeetings-web/src/main/webapp/css/raw-room.css | 19 ----
openmeetings-web/src/main/webapp/css/raw-tree.css | 111 ++++-----------------
3 files changed, 24 insertions(+), 112 deletions(-)
diff --git a/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
b/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
index e2d5db6..ebd85a1 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
@@ -113,8 +113,8 @@ html[dir="rtl"] #chat .messageArea .user-row {
padding-right: 40px !important;
background-position-x: 100%;
}
-html[dir="rtl"] @media screen and (max-width: 1280px) {
- .room-block .sidebar .tab.om-icon.big {
+@media screen and (max-width: 1280px) {
+ html[dir="rtl"] .room-block .sidebar .tab.om-icon.big {
padding-left: 0 !important;
}
}
@@ -132,7 +132,7 @@ html[dir="rtl"] .room-block .sidebar .user-list .user
.ui-icon.audio-activity {
html[dir="rtl"] .list-table th {
text-align: right !important;
}
-
+/**** file-tree **************/
/**** TODO need to be moved to wicket-jquery-ui **************/
html[dir="rtl"] span.css-emoticon.un-transformed-emoticon
, html[dir="rtl"] span.css-emoticon.animated-emoticon:hover
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 2204572..a46c839 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -792,23 +792,4 @@ html[dir="rtl"] .room-block .sb-wb .sidebar {
.room-block.big .sb-wb .sidebar .user-list .user.name {
display: block;
}
- .room-block .sb-wb .sidebar .file-tree .file.item .name
- , .room-block .sb-wb .sidebar .file-tree .file.item .name span
- {
- width: 40px;
- }
- .room-block.big .sb-wb .sidebar .file-tree .file.item .name
- , .room-block.big .sb-wb .sidebar .file-tree .file.item .name span
- {
- width: 255px;
- }
- .room-block .sb-wb .sidebar .file-tree .file.item .name span {
- padding: 0;
- }
- .room-block .sb-wb .sidebar .file-tree .file.item {
- width: 80px;
- }
- .room-block.big .sb-wb .sidebar .file-tree .file.item {
- width: auto;
- }
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index fdd1983..b09e216 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -15,6 +15,26 @@
height: 2px;
width: 2px;
}
+.trees .tree-theme-windows
+, .trees .tree-theme-windows > :first-child
+, .trees .tree-theme-windows .tree-branch
+, .trees .tree-theme-windows .tree-branch .tree-node
+, .trees .tree-theme-windows .tree-subtree .tree-branch
+, .trees .tree-theme-windows .tree-node .om-icon
+, .trees .tree-theme-windows .tree-node .om-icon .file.item
+, .trees .tree-theme-windows .tree-node .om-icon .file.item .name
+, .trees .tree-theme-windows .tree-node .om-icon .file.item .name span
+{
+ width: 100%;
+}
+.trees .tree-theme-windows div.tree-subtree
+, .trees .tree-theme-windows .tree-node .om-icon
+{
+ width: calc(100% - 20px);
+}
+.trees .tree-theme-windows .tree-node .om-icon.broken .file.item .name {
+ width: calc(100% - 32px);
+}
.file-tree .footer {
height: var(--tree-footer-height);
}
@@ -28,90 +48,6 @@
display: inline-block;
margin: 0 2px;
}
-/* Calc width with default for max level of 7 */
-.file-tree .file.item .name
- , .file-tree .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 26px);
- min-width: 60px;
-}
-.file-tree .tree-subtree .file.item .name
- , .file-tree .tree-subtree .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 44px);
-}
-.file-tree .tree-subtree .tree-subtree .file.item .name
- , .file-tree .tree-subtree .tree-subtree .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 62px);
-}
-.file-tree .tree-subtree .tree-subtree .tree-subtree .file.item .name
- , .file-tree .tree-subtree .tree-subtree .tree-subtree .file.item .name
span
-{
- max-width: calc(var(--sidebar-width) - 80px);
-}
-.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree .file.item
.name
- , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 98px);
-}
-.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .file.item .name
- , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 116px);
-}
-.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .file.item .name
- , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 134px);
-}
-.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .tree-subtree .file.item .name
- , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .tree-subtree .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 152px);
-}
-/* adding 32px extra space in case "broken" symbol is on same row*/
-.file-tree .broken .file.item .name
- , .file-tree .broken .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 58px);
- min-width: 60px;
-}
-.file-tree .tree-subtree .broken .file.item .name
- , .file-tree .tree-subtree .broken .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 76px);
-}
-.file-tree .tree-subtree .tree-subtree .broken .file.item .name
- , .file-tree .tree-subtree .tree-subtree .broken .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 94px);
-}
-.file-tree .tree-subtree .tree-subtree .tree-subtree .broken .file.item .name
- , .file-tree .tree-subtree .tree-subtree .tree-subtree .broken
.file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 112px);
-}
-.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree .broken
.file.item .name
- , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.broken .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 130px);
-}
-.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .broken .file.item .name
- , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .broken .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 148px);
-}
-.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .broken .file.item .name
- , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .broken .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 166px);
-}
-.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .tree-subtree .broken .file.item .name
- , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .tree-subtree .broken .file.item .name span
-{
- max-width: calc(var(--sidebar-width) - 184px);
-}
.trash-toolbar {
font-weight: bold;
line-height: 20px;
@@ -160,11 +96,6 @@
position: absolute;
left: 3px;
}
-.trees .om-icon span {
- white-space: nowrap;
- padding-right: 20px;
- vertical-align: top;
-}
.trees .tree-node {
white-space: nowrap;
}
@@ -254,7 +185,7 @@
.file.item .errors {
position: absolute;
top: 0px;
- right: 0px;
+ right: 1px;
width: 32px;
height: 32px;
margin: 0px;
