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 2019/08/14 16:49:04 UTC
[openmeetings] branch master updated (621d703 -> fcabba2)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from 621d703 [OPENMEETINGS-2045] '0ch' is replaced with '0px'
new 80ab8a8 Revert "[OPENMEETINGS-2045] '0ch' is replaced with '0px'"
new fcabba2 [OPENMEETINGS-2045] '0ch' is replaced with '0px'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
openmeetings-web/src/main/webapp/css/raw-room.css | 395 +++++++---------------
1 file changed, 130 insertions(+), 265 deletions(-)
[openmeetings] 01/02: Revert "[OPENMEETINGS-2045] '0ch' is replaced
with '0px'"
Posted by so...@apache.org.
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
commit 80ab8a892fd658985866d60844daa75ca2980242
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Aug 14 23:45:14 2019 +0700
Revert "[OPENMEETINGS-2045] '0ch' is replaced with '0px'"
This reverts commit 621d703d97f7b89bb709dddd3fe08925fd81ceb2.
---
openmeetings-web/src/main/webapp/css/raw-chat.css | 6 +-
openmeetings-web/src/main/webapp/css/raw-room.css | 395 +++++++--------------
.../src/main/webapp/css/raw-variables.css | 16 +-
3 files changed, 141 insertions(+), 276 deletions(-)
diff --git a/openmeetings-web/src/main/webapp/css/raw-chat.css b/openmeetings-web/src/main/webapp/css/raw-chat.css
index 6dbdb07..536cd70 100644
--- a/openmeetings-web/src/main/webapp/css/raw-chat.css
+++ b/openmeetings-web/src/main/webapp/css/raw-chat.css
@@ -144,17 +144,17 @@
}
/* room mode */
.main.room #chatPanel {
- right: 0px;
+ right: 0ch;
top: var(--room-menu-height);
}
html[dir="rtl"] .main.room #chatPanel {
right: auto !important; /* IE */
right: initial !important;
- left: 0px;
+ left: 0ch;
}
.main.room #chatPanel #chat form {
position: absolute;
- bottom: 0px;
+ bottom: 0ch;
left: 1px;
width: 100%;
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css b/openmeetings-web/src/main/webapp/css/raw-room.css
index 0b982cf..c9caca7 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -1,303 +1,141 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-@font-face {
- font-family: 'Font Awesome 5 Free';
- font-style: normal;
- font-weight: 900;
- font-display: auto;
- src: url(fa-solid-900.woff);
-}
-.room.holder {
+/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
+.room-block, .room-block .container {
width: 100%;
height: 100%;
- --sidebar-width: 320px;
- --mod-video-tool-height: 50px;
- --mod-video-height: 180px;
- --room-menu-height: 50px;
- --tabbar-height: 40px;
- --room-wb-footer-height: 50px;
- --room-paint-width: 50px;
-}
-.room.box {
- height: 100%;
- position: relative;
-}
-.room.box .room-menu {
- position: absolute;
- top: 0;
- width: calc(100% - var(--sidebar-width) - var(--room-paint-width));
- height: var(--room-menu-height);
- left: var(--sidebar-width);
- background-color: #2E2A2B;
-}
-.room.box .room-menu .room.menu {
- left: 0;
-}
-.room.box .room-menu #menu {
- float: right;
}
-.ui-icon.room.menu.exit {
+.room-block .menu .ui-icon.exit {
background-image: url(images/exit_button.png);
background-repeat: no-repeat;
background-size: 16px 16px;
margin-left: 5px;
}
.ui-icon.status-user {
- display: none;
background-image: url(images/status-user.png);
}
.ui-icon.status-wb {
- display: none;
background-image: url(images/status-wb.png);
}
.ui-icon.status-mod {
- display: none;
background-image: url(images/status-mod.png);
}
-.room.box .sidebar-container {
- width: var(--sidebar-width);
- height: 100%;
- display: inline-block;
+.room-block .sidebar {
+ min-width: 155px;
+ width: var(--room-sidebar-width);
position: absolute;
- top: 0px;
- left: 0px;
+ height: calc(100% - var(--room-menu-height));
+ right: auto;
+ left: 0;
}
-.room.box .sidebar-container .header-container {
- height: calc(var(--mod-video-tool-height) + var(--mod-video-height));
+.room-block .sidebar #room-sidebar-tabs {
+ height: calc(100% - var(--buffer-size) - var(--activities-height));
}
-.room.sidebar {
- width: var(--sidebar-width);
- height: calc(100% - var(--mod-video-tool-height) - var(--mod-video-height));
+html[dir="rtl"] .room-block .sidebar {
+ right: 0;
+ left: auto;
}
-.room.sidebar #busy-indicator {
+.room-block .sidebar #busy-indicator {
margin: 8px;
}
-.room.sidebar #room-sidebar-tabs {
- height: 100%;
- padding: 0;
-}
-.room.sidebar .ui-tabs-panel {
- height: calc(100% - 45px);
-}
-.room.sidebar .ui-tabs-panel .user.list {
- height: 100%;
-}
-.room.sidebar .ui-tab {
- background-color: #FFFFFF;
-}
-.room.sidebar .ui-tabs-active.ui-state-active {
- border-bottom: 4px solid #F37446;
-}
-.room.sidebar .ui-tabs-active a, .room.sidebar .ui-tab a {
- color: #000000;
- font-weight: bold;
-}
-.room.sidebar .ui-corner-all, .room.sidebar .ui-corner-top {
- border: 0;
- border-radius: 0;
-}
-.room.sidebar .ui-widget-header, .room.sidebar .ui-widget-content {
- background-color: #FFFFFF;
- border: 0;
-}
-.room.sidebar .ui-resizable-handle, #chatPanel.room .ui-resizable-handle {
- display: none;
+.room-block .sidebar .ui-resizable-handle, #chatPanel.room .ui-resizable-handle {
width: 4px;
background-color: #f3f3f4;
border: 1px solid #dedee0;
}
-.room.sidebar .ui-resizable-handle:hover, #chatPanel.room .ui-resizable-handle:hover {
+.room-block .sidebar .ui-resizable-handle:hover, #chatPanel.room .ui-resizable-handle:hover {
background-color: #b6bdca;
border-color: #bebec3;
}
-.room.sidebar .ui-tabs .ui-tabs-panel {
+.room-block .sidebar .ui-tabs .ui-tabs-panel {
padding: 0;
}
-.room.sidebar .header-container {
- height: var(--mod-video-tool-height);
-}
-.room.box .sidebar-container .header-container .label {
- font-size: 16px;
- font-weight: bold;
- padding: 16px 16px 13px 16px;
- display: inline-block;
- vertical-align: top;
- width: 82px;
-}
-.room.box .sidebar-container .header-container .user.header {
- display: inline-block;
- height: 33px;
- vertical-align: top;
- padding-top: 16px;
- padding-left: 16px;
- width: calc(100% - 134px);
-}
-.room.box .sidebar-container .header-container .video-area {
- height: 180px;
- background-color: #e9e9e9;
- overflow: hidden;
- position: relative;
-}
-.room.box .sidebar-container .header-container .video-area .video-icon {
- position: absolute;
- top: 52px;
- left: 134px;
- width: 52px;
- height: 37px;
- text-align: center;
-}
-.room.box .sidebar-container .header-container .video-area .video-icon::after {
- font-size: 32px;
- line-height: 37px;
- content: "\f03d";
- color: #231F20;
- opacity: 0.4;
-}
-.room.box .sidebar-container .header-container .video-area .text {
- position: absolute;
- font-size: 12px;
- line-height: 15px;
- color: #231F20;
- opacity: 0.4;
- top: 87px;
- left: 131px;
-}
-.room.box .sidebar-container .header-container .video-area .start {
- position: absolute;
- top: 119px;
- left: 87px;
- font-size: 16px;
- line-height: 19px;
- text-align: center;
- color: #F37446;
-}
-.room.box .sidebar-container .header-container .video-area .ui-dialog-titlebar {
- height: 0px;
- width: 0px;
- border: 0;
-}
-.room.box .sidebar-container .header-container .video-area .ui-dialog-titlebar-refresh {
- position: absolute;
- top: 14px;
- left: 295px;
- z-index: 1;
-}
-.room.box .sidebar-container .header-container .video-area .ui-icon-refresh {
- width: 16px;
- height: 16px;
- padding: 0;
- margin: 0;
-}
-.room.box .sidebar-container .header-container .video-area .ui-dialog.video.user-video {
- position: absolute;
- height: 180px !important;
- width: 320px !important;
- top: 0px !important;
- left: 0px !important;
-}
-.room.box .sidebar-container .header-container .video-area .ui-dialog.video.user-video .ui-dialog-content {
- height: 180px !important;
- width: 320px !important;
-}
-.room.box .sidebar-container .header-container .video-area .ui-widget.ui-widget-content {
- border: 0;
- border-radius: 0;
- box-shadow: none;
-}
-.room.box .sidebar-container .header-container .user.header .fa-icon.settings::after {
- content: "\f013";
- font-size: 16px;
-}
-.room.box .sidebar-container .header-container .user.header .fa-icon.enabled::after {
- color: #F37446;
-}
-.room.box .sidebar-container .header-container .user.header .fa-icon.cam::after {
- content: "\f03d";
- padding-left: 16px;
- font-size: 16px;
-}
-.room.box .sidebar-container .header-container .user.header .fa-icon.mic::after {
- content: "\f130";
- padding-left: 16px;
- font-size: 16px;
+#room-sidebar-tab-users .header {
+ padding-left: 5px;
+ height: var(--room-sidebar-header-height);
}
-.room.box .sidebar-container .header-container .ui-icon {
+#room-sidebar-tab-users .header .ui-icon {
margin-top: 5px;
margin-left: 5px;
width: 32px;
height: 32px;
}
-.room.sidebar .user.list {
+.room-block .sidebar .user-list {
overflow-y: auto;
+ height: calc(100% - var(--room-sidebar-header-height) - var(--buffer-size));
}
-.room.sidebar .user.list .user {
- background-position: 20px 20px;
- background-size: 30px 30px;
- padding: 0;
- height: 70px;
+.room-block .sidebar .user-list .user {
+ min-height: 40px;
+ padding-left: 5px;
+ padding-top: 5px;
+ background-size: 40px 40px;
background-repeat: no-repeat;
+ background-position: 2px 2px;
position: relative;
}
-.room.sidebar .user.list .user .user.actions {
+.room-block .sidebar .user-list .user:hover {
+ background-size: 80px 80px;
+ min-height: 80px;
+}
+.room-block .sidebar .user-list .user:hover .user.name {
+ padding: 0px;
+ margin-top: 84px;
+ min-height: 18px;
+}
+.room-block .sidebar .user-list .user .user.actions {
display: none;
}
-.room.holder .room.sidebar .user.list .user:hover .user.actions {
+.room-block.small .sidebar .user-list .user:hover .user.actions {
+ margin-top: 84px;
+}
+.room-block .sidebar .user-list .user:hover .user.actions {
display: block;
min-height: 18px;
padding: 0;
margin-right: 35px;
}
-.room.sidebar .user.list .user.name {
- font-size: 14px;
- line-height: 17px;
- font-weight: bold;
- color: #204E79;
- padding: 20px 0px 0px 60px;
- width: 131px;
+.room-block .sidebar .user-list .user.name {
+ line-height: 18px;
+ height: 18px;
+ padding: 0;
+ padding-left: 44px;
+ margin-right: 20px;
overflow: hidden;
}
-.room.sidebar .user.list .user .user.actions .ui-icon {
+.room-block.small .sidebar .user-list .user.name {
+ display: none;
+}
+.room-block .sidebar .user-list .user .user.actions .ui-icon {
margin-right: 2px;
margin-top: 0;
}
-.room.sidebar .user.list .user .ui-icon {
+.room-block .sidebar .user-list .user .ui-icon {
background-size: 16px;
}
-.room.sidebar .user.list .user .ui-icon.audio-activity {
+.room-block .sidebar .user-list .user .ui-icon.audio-activity {
position: absolute;
bottom: 0px;
right: 3px;
}
-.room.sidebar .user.list .user .ui-icon.big {
+.room-block .sidebar .user-list .user .ui-icon.big {
background-size: 32px;
}
-.room.sidebar .icon-undock, .room.sidebar .icon-dock {
+.room-block .sidebar .icon-undock, .room-block .sidebar .icon-dock {
width: 16px;
height: 16px;
}
-.room.sidebar .icon-undock {
+.room-block .sidebar .icon-undock {
background-image: url(images/double-arrow-left.png);
}
-.room.sidebar .icon-dock {
+.room-block .sidebar .icon-dock {
background-image: url(images/double-arrow-right.png);
}
-.room.sidebar.closed #room-sidebar-tab-users, .room.sidebar.closed #room-sidebar-tab-files {
+.room-block .sidebar #room-sidebar-tab-users
+, .room-block .sidebar #room-sidebar-tab-files
+{
+ height: calc(100% - 44px);
+}
+.room-block .sidebar.closed #room-sidebar-tab-users
+, .room-block .sidebar.closed #room-sidebar-tab-files
+{
display: none;
}
.audio-activity.ui-icon {
@@ -321,7 +159,7 @@
.right.moderator.ui-icon {
background-image: url(images/user_add.png);
}
-.room.menu.right .icon.ask {
+.room-block .menu .details .icon.ask {
background-image: url(images/hand.png);
}
.right.moderator.ui-icon.granted {
@@ -360,7 +198,7 @@
.right.camera.ui-icon {
background-image: url(images/webcam_add.png);
}
-.room.sidebar .user.list .user .kick.ui-icon {
+.room-block .sidebar .user-list .user .kick.ui-icon {
background-size: auto; /* IE */
background-size: initial;
}
@@ -394,10 +232,14 @@
.activity.mic.enabled.ui-icon {
background-image: url(images/microphone_disable.png);
}
-.room.sidebar .user.list .user .user.actions .ui-icon.bumper
- , .room.sidebar .user.header .ui-icon.bumper {
+.room-block .sidebar .user-list .user .user.actions .ui-icon.bumper
+, #room-sidebar-tab-users .header .ui-icon.bumper {
padding-right: 5px;
}
+.room-block .sidebar .user-list .user.current {
+ font-weight: bold;
+ background-color: #00FF00;
+}
.ui-dialog.video, .ui-dialog.video .ui-dialog-titlebar, .ui-dialog.video .ui-dialog-content {
padding: 0;
}
@@ -501,42 +343,42 @@ ul.settings-menu {
padding: .1em .7em;
font-weight: bolder;
}
-.room.sidebar .tab.om-icon.big {
+.room-block .sidebar .tab.om-icon.big {
padding: 0em 1em 0 2.5em;
line-height: 30px;
width: auto;
max-width: 80px;
}
-.room.sidebar .tab.om-icon.big .label {
+.room-block .sidebar .tab.om-icon.big .label {
max-width: 50px;
display: inline-block;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
-.room.holder.small .room.sidebar .tab.user.om-icon.big {
+.room-block.small .sidebar .tab.user.om-icon.big {
max-width: 20px;
}
-.room.holder.small .room.sidebar .tab.om-icon.big {
+.room-block.small .sidebar .tab.om-icon.big {
max-width: 0px;
padding-right: 0;
}
-.room.holder.small .room.sidebar .tab.om-icon.big .label {
+.room-block.small .sidebar .tab.om-icon.big .label {
display: none;
}
-.room.holder.small .room.sidebar .tab.om-icon.big .badge {
+.room-block.small .sidebar .tab.om-icon.big .badge {
margin-left: -20px;
margin-top: 15px;
}
-.room.holder.small .room.sidebar .file.tree .file.item .name
- , .room.holder.small .room.sidebar .file.tree .file.item .name span
+.room-block.small .sidebar .file.tree .file.item .name
+ , .room-block.small .sidebar .file.tree .file.item .name span
{
width: 40px;
}
-.room.sidebar .tab.om-icon.big.user {
+.room-block .sidebar .tab.om-icon.big.user {
background-image: url(images/group.png);
}
-.room.sidebar .tab.om-icon.big.file {
+.room-block .sidebar .tab.om-icon.big.file {
background-image: url(images/folder_explore.png);
}
.ui-state-active .badge {
@@ -559,28 +401,25 @@ ul.settings-menu {
border-radius: 10px;
}
/************ VIDEO **************/
-.room.box .user-video.audio-only {
- display: none !important;
-}
-.room.box .user-video {
+.room-block .container .user-video {
display: inline-block !important;
}
-.room.box .user-video .header {
+.room-block .container .user-video .header {
height: 20px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
-.room.box .user-video .header .ui-dialog-title {
+.room-block .container .user-video .header .ui-dialog-title {
padding-left: 5px;
}
-.room.box .user-video .video {
+.room-block .container .user-video .video {
min-width: 40px;
min-height: 30px;
overflow: hidden;
position: relative;
}
-.room.box .user-video .video.audio-only {
+.room-block .container .user-video .video.audio-only {
background-repeat: no-repeat;
background-size: auto 100%;
background-position: center;
@@ -665,22 +504,26 @@ ul.settings-menu {
min-width: 250px;
max-width: 250px;
}
-.room.box.interview .room.wb.area .wb-area .rec-btn {
+.main.room.interview .wb-block .wb-area .rec-btn {
z-index: 100;
border-radius: 30px;
position: absolute;
- right: 200px;
+ right: 50%;
bottom: 0px;
width: 40px;
- height: 40px;
+ height: var(--rec-btn-height);
+}
+.main.room.interview .wb-block .wb-area .pod-area {
+ width: 100%;
+ height: calc(100% - var(--rec-btn-height));
}
-.room.box.interview .room.wb.area .wb-area .rec-btn .ui-button-icon.ui-icon.stop
-, .room.box.interview .room.wb.area .wb-area .rec-btn .ui-button-icon.ui-icon.record
+.main.room.interview .wb-block .wb-area .rec-btn .ui-button-icon.ui-icon.stop
+, .main.room.interview .wb-block .wb-area .rec-btn .ui-button-icon.ui-icon.record
{
background-image: none;
background-color: red;
}
-.room.box.interview .room.wb.area .wb-area .rec-btn .ui-button-icon.ui-icon.record {
+.main.room.interview .wb-block .wb-area .rec-btn .ui-button-icon.ui-icon.record {
border-radius: 15px;
}
#quick-vote {
@@ -709,14 +552,14 @@ ul.settings-menu {
right: 0;
bottom: 0;
}
-.room.box.interview #quick-vote {
+.main.room.interview #quick-vote {
z-index: 100;
right: 10px;
bottom: 0;
padding: 0px 5px 0px 5px;
height: 40px;
}
-.room.box.interview #quick-vote .close {
+.main.room.interview #quick-vote .close {
display: inline-block;
float: right;
}
@@ -749,15 +592,37 @@ ul.settings-menu {
display: block;
}
@media screen and (max-width: 1280px) {
- .room.sidebar {
- width: var(--sidebar-width);
- }
- .room.holder .room.sidebar .tab.om-icon.big {
+ .room-block .sidebar .tab.om-icon.big {
max-width: 0px;
padding-right: 0;
}
- .room.holder.big .room.sidebar .tab.om-icon.big {
+ .room-block.big .sidebar .tab.om-icon.big {
max-width: 80px;
padding: 0em 1em 0 2.5em;
}
+ .room-block .sidebar .user-list .user.name {
+ display: none;
+ }
+ .room-block.big .sidebar .user-list .user.name {
+ display: block;
+ }
+ .room-block .sidebar .file.tree .file.item .name
+ , .room-block .sidebar .file.tree .file.item .name span
+ {
+ width: 40px;
+ }
+ .room-block.big .sidebar .file.tree .file.item .name
+ , .room-block.big .sidebar .file.tree .file.item .name span
+ {
+ width: 255px;
+ }
+ .room-block .sidebar .file.tree .file.item .name span {
+ padding: 0;
+ }
+ .room-block .sidebar .file.tree .file.item {
+ width: 80px;
+ }
+ .room-block.big .sidebar .file.tree .file.item {
+ width: auto;
+ }
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-variables.css b/openmeetings-web/src/main/webapp/css/raw-variables.css
index a8d110a..e90534c 100644
--- a/openmeetings-web/src/main/webapp/css/raw-variables.css
+++ b/openmeetings-web/src/main/webapp/css/raw-variables.css
@@ -14,13 +14,13 @@ body {
--chat-msg-height: 80px;
}
body.no-header {
- --header-height: 0px;
+ --header-height: 0ch; /* 0px is being stripped by YUI compressor*/
}
body.no-menu {
- --menu-height: 0px;
+ --menu-height: 0ch; /* 0px is being stripped by YUI compressor*/
}
.adminPanel {
- --lbl-nav-height: 0px;
+ --lbl-nav-height: 0ch; /* 0px is being stripped by YUI compressor*/
--nav-height: 30px;
--list-width: 518px;
}
@@ -28,7 +28,7 @@ body.no-menu {
--lbl-nav-height: 40px;
}
.adminPanelColumnForm {
- --actions-height: 0px;
+ --actions-height: 0ch; /* 0px is being stripped by YUI compressor*/
}
.adminPanelColumnForm .adminForm {
--actions-height: 40px;
@@ -41,7 +41,7 @@ body.no-menu {
--tree-footer-height: 40px;
}
.main.room {
- --header-height: 0px;
+ --header-height: 0ch;
--room-menu-height: 34px;
--room-sidebar-width: 315px;
--room-wb-tabs-height: 45px;
@@ -54,13 +54,13 @@ body.no-menu {
--rec-btn-height: 40px;
}
.main.room.no-menu {
- --room-menu-height: 0px;
+ --room-menu-height: 0ch;
}
.main.room.no-activities {
- --activities-height: 0px;
+ --activities-height: 0ch;
}
.main.room.no-chat {
- --chat-width: 0px;
+ --chat-width: 0ch;
}
@media screen and (max-width: 1280px) {
.main.room {
[openmeetings] 02/02: [OPENMEETINGS-2045] '0ch' is replaced with
'0px'
Posted by so...@apache.org.
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
commit fcabba2c4d1bffbbabc84f5aace1e3836a26d595
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Aug 14 23:48:52 2019 +0700
[OPENMEETINGS-2045] '0ch' is replaced with '0px'
---
openmeetings-web/src/main/webapp/css/raw-chat.css | 6 +++---
openmeetings-web/src/main/webapp/css/raw-variables.css | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/openmeetings-web/src/main/webapp/css/raw-chat.css b/openmeetings-web/src/main/webapp/css/raw-chat.css
index 536cd70..6dbdb07 100644
--- a/openmeetings-web/src/main/webapp/css/raw-chat.css
+++ b/openmeetings-web/src/main/webapp/css/raw-chat.css
@@ -144,17 +144,17 @@
}
/* room mode */
.main.room #chatPanel {
- right: 0ch;
+ right: 0px;
top: var(--room-menu-height);
}
html[dir="rtl"] .main.room #chatPanel {
right: auto !important; /* IE */
right: initial !important;
- left: 0ch;
+ left: 0px;
}
.main.room #chatPanel #chat form {
position: absolute;
- bottom: 0ch;
+ bottom: 0px;
left: 1px;
width: 100%;
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-variables.css b/openmeetings-web/src/main/webapp/css/raw-variables.css
index e90534c..a8d110a 100644
--- a/openmeetings-web/src/main/webapp/css/raw-variables.css
+++ b/openmeetings-web/src/main/webapp/css/raw-variables.css
@@ -14,13 +14,13 @@ body {
--chat-msg-height: 80px;
}
body.no-header {
- --header-height: 0ch; /* 0px is being stripped by YUI compressor*/
+ --header-height: 0px;
}
body.no-menu {
- --menu-height: 0ch; /* 0px is being stripped by YUI compressor*/
+ --menu-height: 0px;
}
.adminPanel {
- --lbl-nav-height: 0ch; /* 0px is being stripped by YUI compressor*/
+ --lbl-nav-height: 0px;
--nav-height: 30px;
--list-width: 518px;
}
@@ -28,7 +28,7 @@ body.no-menu {
--lbl-nav-height: 40px;
}
.adminPanelColumnForm {
- --actions-height: 0ch; /* 0px is being stripped by YUI compressor*/
+ --actions-height: 0px;
}
.adminPanelColumnForm .adminForm {
--actions-height: 40px;
@@ -41,7 +41,7 @@ body.no-menu {
--tree-footer-height: 40px;
}
.main.room {
- --header-height: 0ch;
+ --header-height: 0px;
--room-menu-height: 34px;
--room-sidebar-width: 315px;
--room-wb-tabs-height: 45px;
@@ -54,13 +54,13 @@ body.no-menu {
--rec-btn-height: 40px;
}
.main.room.no-menu {
- --room-menu-height: 0ch;
+ --room-menu-height: 0px;
}
.main.room.no-activities {
- --activities-height: 0ch;
+ --activities-height: 0px;
}
.main.room.no-chat {
- --chat-width: 0ch;
+ --chat-width: 0px;
}
@media screen and (max-width: 1280px) {
.main.room {