This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2347-fix-recording-ui-cut-files-when-nested
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to
refs/heads/feature/OPENMEETINGS-2347-fix-recording-ui-cut-files-when-nested by
this push:
new 9f7bd75 OPENMEETINGS-2347 Fix rename of now common variable.
9f7bd75 is described below
commit 9f7bd75010a1fc2e63501d09fa9c1123bdf0cc72
Author: Sebastian Wagner <sebawag...@apache.org>
AuthorDate: Wed May 13 08:13:42 2020 +1200
OPENMEETINGS-2347 Fix rename of now common variable.
---
.../org/apache/openmeetings/web/room/raw-room.js | 2 +-
openmeetings-web/src/main/webapp/css/raw-room.css | 2 +-
openmeetings-web/src/main/webapp/css/raw-tree.css | 34 +++++++++++-----------
.../src/main/webapp/css/raw-variables.css | 5 ++--
openmeetings-web/src/main/webapp/css/raw-wb.css | 6 ++--
5 files changed, 24 insertions(+), 25 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
index 80c1281..75572e3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
@@ -120,7 +120,7 @@ var Room = (function() {
function _setSize() {
const sbW = _sbWidth()
, holder = $('.room-block');
- ($('.main.room')[0]).style.setProperty('--room-sidebar-width',
sbW + 'px');
+ ($('.main.room')[0]).style.setProperty('--sidebar-width', sbW +
'px');
if (sbW > 285) {
holder.addClass('big').removeClass('narrow');
} else {
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 7f7f144..2aea7c6 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -24,7 +24,7 @@
}
.room-block .sb-wb .sidebar {
min-width: 155px;
- width: var(--room-sidebar-width);
+ width: var(--sidebar-width);
position: absolute;
height: 100%;
top: 0;
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index b978f1d..d4eef5c 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -7,7 +7,7 @@
}
.file-tree .trees {
height: calc(100% - var(--tree-header-height) -
var(--tree-footer-height));
- width: var(--room-sidebar-width);
+ width: var(--sidebar-width);
overflow-x: auto;
overflow-y: auto;
}
@@ -28,85 +28,85 @@
.file-tree .file.item .name
, .file-tree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 26px);
+ 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(--room-sidebar-width) - 44px);
+ 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(--room-sidebar-width) - 62px);
+ 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(--room-sidebar-width) - 80px);
+ 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(--room-sidebar-width) - 98px);
+ 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(--room-sidebar-width) - 116px);
+ 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(--room-sidebar-width) - 134px);
+ 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(--room-sidebar-width) - 152px);
+ 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(--room-sidebar-width) - 58px);
+ 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(--room-sidebar-width) - 76px);
+ 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(--room-sidebar-width) - 94px);
+ 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(--room-sidebar-width) - 112px);
+ 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(--room-sidebar-width) - 130px);
+ 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(--room-sidebar-width) - 148px);
+ 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(--room-sidebar-width) - 166px);
+ 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(--room-sidebar-width) - 184px);
+ max-width: calc(var(--sidebar-width) - 184px);
}
.trash-toolbar {
font-weight: bold;
diff --git a/openmeetings-web/src/main/webapp/css/raw-variables.css
b/openmeetings-web/src/main/webapp/css/raw-variables.css
index eac09f9..3a6296a 100644
--- a/openmeetings-web/src/main/webapp/css/raw-variables.css
+++ b/openmeetings-web/src/main/webapp/css/raw-variables.css
@@ -4,7 +4,7 @@ body {
--menu-height: 36px;
--level-color: #ADFF2F;
--rooms-header-height: 70px;
- --room-sidebar-width: 315px;
+ --sidebar-width: 315px;
--tabs-height: 45px;
--buffer-size: 4px;
--menu-zindex: 10000000;
@@ -44,7 +44,6 @@ body.no-menu {
.main.room {
--header-height: 0px;
--room-menu-height: calc(22px + 1rem);
- --room-sidebar-width: 315px;
--room-wb-tabs-height: 45px;
--room-sidebar-header-height: 37px;
--chat-width: 20px;
@@ -72,6 +71,6 @@ body.no-menu {
}
@media screen and (max-width: 1280px) {
.main.room {
- --room-sidebar-width: 155px;
+ --sidebar-width: 155px;
}
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-wb.css
b/openmeetings-web/src/main/webapp/css/raw-wb.css
index e4dcbb8..cf02a6e 100644
--- a/openmeetings-web/src/main/webapp/css/raw-wb.css
+++ b/openmeetings-web/src/main/webapp/css/raw-wb.css
@@ -2,12 +2,12 @@
.room-block .sb-wb .wb-block {
position: absolute;
height: 100%;
- width: calc(100% - var(--room-sidebar-width) - var(--buffer-size));
+ width: calc(100% - var(--sidebar-width) - var(--buffer-size));
top: 0;
- left: calc(var(--room-sidebar-width) + var(--buffer-size));
+ left: calc(var(--sidebar-width) + var(--buffer-size));
}
html[dir="rtl"] .room-block .sb-wb .wb-block {
- right: calc(var(--room-sidebar-width) + var(--buffer-size));
+ right: calc(var(--sidebar-width) + var(--buffer-size));
left: auto;
}
.room-block .sb-wb .wb-block.droppable-hover {
