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 2020/04/27 17:45:55 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2311] there
should be no overlapping
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 5300fde [OPENMEETINGS-2311] there should be no overlapping
5300fde is described below
commit 5300fde1caab23495d837e75382b0740718bb557
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Apr 28 00:45:38 2020 +0700
[OPENMEETINGS-2311] there should be no overlapping
---
.../java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html | 4 ++--
openmeetings-web/src/main/webapp/css/raw-general.css | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html
index bd406b6..656639a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html
@@ -24,14 +24,14 @@
<table class="room-list table table-striped table-hover">
<tr wicket:id="list" class="room-row">
<td class="position-relative">
- <div class="container" wicket:id="roomContainer">
+ <div class="col-10 container" wicket:id="roomContainer">
<div><span wicket:id="roomName">[room name]</span> <i wicket:id="info" class="fas fa-info-circle text-info info-tooltip"></i></div>
<div>
<wicket:message key="398" /> <span wicket:id="curUsers"></span> / <span
wicket:id="totalUsers"></span> <button wicket:id="refresh" class="refresh btn-sm m2"></button>
</div>
</div>
- <button wicket:id="btn" class="enter btn btn-outline-primary"><span wicket:id="label"></span></button>
+ <button wicket:id="btn" class="col-2 enter btn btn-outline-primary"><span wicket:id="label"></span></button>
</td>
</tr>
</table>
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css b/openmeetings-web/src/main/webapp/css/raw-general.css
index 30ec440..f25dc9a 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -453,6 +453,9 @@ select.messages.selector {
height: 100%;
overflow-y: auto;
}
+.rooms-table .room-row .container {
+ margin: 0;
+}
.rooms.title {
font-weight: bold;
padding: 10px;