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 d0d4a5e [OPENMEETINGS-2165] minor CSS improvements
d0d4a5e is described below
commit d0d4a5eea70c03432e3eda8739ac186130662a06
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Mar 29 22:40:43 2020 +0700
[OPENMEETINGS-2165] minor CSS improvements
---
.../java/org/apache/openmeetings/web/room/wb/WbPanel.html | 4 +---
.../java/org/apache/openmeetings/web/user/chat/raw-chat.js | 14 +-------------
openmeetings-web/src/main/webapp/css/raw-chat.css | 12 ++++++++++++
openmeetings-web/src/main/webapp/css/raw-room.css | 2 +-
openmeetings-web/src/main/webapp/css/raw-wb.css | 14 +++++++-------
5 files changed, 22 insertions(+), 24 deletions(-)
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 e17da64..6af9ad5 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
@@ -64,9 +64,7 @@
<div wicket:message="title:75" class="clickable
om-icon big line"></div>
<div wicket:message="title:76" class="clickable
om-icon big uline"></div>
<div wicket:message="title:77" class="clickable
om-icon big rect"></div>
- <div wicket:message="title:78" class="clickable
om-icon big ellipse">
- <div/>
- </div>
+ <div wicket:message="title:78" class="clickable
om-icon big ellipse"></div>
<div wicket:message="title:79" class="clickable
om-icon big arrow"></div>
<div wicket:message="title:wb.tool.white-out"
class="clickable om-icon big eraser"></div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
index 1972f55..6f30673 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
@@ -7,13 +7,9 @@ var Chat = function() {
, closedSizePx = closedSize + "px"
, emoticon = new CSSEmoticon()
, doneTypingInterval = 5000 //time in ms, 5 second for example
- , iconOpen = 'fa-angle-up'
- , iconOpenRoom = 'fa-angle-' + (Settings.isRtl ? 'left' :
'right')
- , iconClose = 'fa-angle-down'
- , iconCloseRoom = 'fa-angle-' + (Settings.isRtl ? 'right' :
'left')
, SEND_ENTER = 'enter', SEND_CTRL = 'ctrl'
;
- let p, pp, ctrl, icon, tabs, openedHeight = "345px", openedWidth =
"300px", allPrefix = "All"
+ let p, pp, ctrl, tabs, openedHeight = "345px", openedWidth = "300px",
allPrefix = "All"
, roomPrefix = "Room ", typingTimer, audio, roomMode = false,
globalWidth = 600
, editor = $('#chatMessage .wysiwyg-editor'), muted = false,
sendOn, DEF_SEND
, userId, inited = false
@@ -157,11 +153,7 @@ var Chat = function() {
clearTimeout(p.data('timeout'));
pp = $('#chatPanel, #chatPopup');
ctrl = $('#chatPopup .control.block');
- icon = $('#chatPopup .control.block i.fas');
editor = $('#chatMessage .wysiwyg-editor');
- icon.removeClass(function(index, className) {
- return (className.match (/(^|\s)fa-angle-\S+/g) ||
[]).join(' ');
- });
initToolbar();
tabs = $("#chatTabs");
tabs.off().on('shown.bs.tab', function (e) {
@@ -175,11 +167,9 @@ var Chat = function() {
$('#chatTabs li:last-child a').tab('show');
});
if (roomMode) {
- icon.addClass(isClosed() ? iconOpenRoom :
iconCloseRoom);
_removeResize();
} else {
ctrl.attr('title', '');
- icon.addClass(iconOpen);
p.removeClass('room opened').addClass('closed')
.off('mouseenter mouseleave')
.resizable({
@@ -339,7 +329,6 @@ var Chat = function() {
}
function _open(handler) {
if (isClosed()) {
- icon.removeClass(roomMode ? iconOpenRoom :
iconOpen).addClass(roomMode ? iconCloseRoom : iconClose);
ctrl.removeClass('bg-warning');
let opts;
if (roomMode) {
@@ -366,7 +355,6 @@ var Chat = function() {
}
function _close(handler) {
if (!isClosed()) {
- icon.removeClass(roomMode ? iconCloseRoom :
iconClose).addClass(roomMode ? iconOpenRoom : iconOpen);
let opts;
if (roomMode) {
opts = {width: closedSizePx};
diff --git a/openmeetings-web/src/main/webapp/css/raw-chat.css
b/openmeetings-web/src/main/webapp/css/raw-chat.css
index f2331c5..4f847e8 100644
--- a/openmeetings-web/src/main/webapp/css/raw-chat.css
+++ b/openmeetings-web/src/main/webapp/css/raw-chat.css
@@ -37,6 +37,18 @@
width: 70px;
padding-left: 5px;
}
+#chatPanel #chatPopup .control.block i::before {
+ content: "\f107";
+}
+#chatPanel.closed #chatPopup .control.block i::before {
+ content: "\f106";
+}
+.main.room #chatPanel #chatPopup .control.block i::before {
+ content: "\f105";
+}
+.main.room #chatPanel.closed #chatPopup .control.block i::before {
+ content: "\f104";
+}
#chat .messageArea .time {
margin-right: 5px;
font-style: italic;
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index cc88030..08d65b7 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -314,7 +314,7 @@ html[dir="rtl"] .room-block .sidebar {
}
.activity.cam.enabled.om-icon::before {
content: '\f03d';
- color: var(--secondary);
+ color: var(--success);
}
.activity.cam.om-icon::before {
content: '\f4e2';
diff --git a/openmeetings-web/src/main/webapp/css/raw-wb.css
b/openmeetings-web/src/main/webapp/css/raw-wb.css
index 8e084cc..3942014 100644
--- a/openmeetings-web/src/main/webapp/css/raw-wb.css
+++ b/openmeetings-web/src/main/webapp/css/raw-wb.css
@@ -96,6 +96,11 @@ html[dir="rtl"] .room-block .wb-block {
.room-block .wb-block .tools .om-icon.big::before {
padding-left: 5px;
}
+.room-block .wb-block .tools .drawings .om-icon.big.stub::before
+, .room-block .wb-block .tools .om-icon.big.math::before
+{
+ font-size: 1.5em;
+}
.room-block .wb-block .tools .om-icon.big.paint::before {
content: '\f304'
}
@@ -114,13 +119,8 @@ html[dir="rtl"] .room-block .wb-block {
.room-block .wb-block .tools .om-icon.big.rect::before {
content: '\f5cb'
}
-.room-block .wb-block .tools .om-icon.big.ellipse div {
- width: 30px;
- height: 30px;
- display: inline-block;
- border-radius: 50%;
- margin: 2px;
- background-color: var(--secondary);
+.room-block .wb-block .tools .om-icon.big.ellipse::before {
+ content: '\f111'
}
.room-block .wb-block .tools .om-icon.big.text::before {
content: 'T';
