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 2018/04/25 16:33:54 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1870] UI changes
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 6277838 [OPENMEETINGS-1870] UI changes
6277838 is described below
commit 627783805de73de77e8d0a8bf4c6758ff68568cf
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Apr 25 23:33:45 2018 +0700
[OPENMEETINGS-1870] UI changes
---
.../org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html | 4 +---
.../java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java | 2 +-
openmeetings-web/src/main/webapp/css/room.css | 3 +++
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html
index 4234176..62d0605 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html
@@ -27,9 +27,7 @@
<span wicket:id="user-speaks"></span>
<div wicket:id="actions" class="user actions">
<span wicket:id="icons"></span>
- <div class="ui-button ui-widget ui-corner-all ui-button-icon-only ui-state-error" wicket:id="kick">
- <span class="ui-button-icon ui-icon ui-icon-closethick"></span>
- </div>
+ <div wicket:id="kick"> </div>
<span wicket:id="privateChat" class="ui-icon align-right clickable private-chat" wicket:message="title:1493" onclick="startPrivateChat($(this));"></span>
<div class="clear"></div>
</div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
index 55c7a86..35e33a8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
@@ -29,7 +29,7 @@ public class KickIcon extends ClientIcon {
public KickIcon(String id, String uid) {
super(id, uid);
- mainCssClass = "kick ";
+ mainCssClass = "kick ui-icon-closethick ";
}
@Override
diff --git a/openmeetings-web/src/main/webapp/css/room.css b/openmeetings-web/src/main/webapp/css/room.css
index 3eb7262..edbdd9a 100644
--- a/openmeetings-web/src/main/webapp/css/room.css
+++ b/openmeetings-web/src/main/webapp/css/room.css
@@ -246,6 +246,9 @@
.right.camera.ui-icon {
background-image: url(images/webcam_add.png);
}
+.room.sidebar .user.list .user .kick.ui-icon {
+ background-size: initial;
+}
.right.camera.ui-icon.granted {
background-image: url(images/webcam_delete.png);
}
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.