[openmeetings] branch master updated: [OPENMEETINGS-1815] iconized mode seems to be fixed

[solomax]

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 c560379  [OPENMEETINGS-1815] iconized mode seems to be fixed
c560379 is described below

commit c560379acd278f64e26beb89584cb36f855022f1
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat Feb 10 14:24:05 2018 +0700

    [OPENMEETINGS-1815] iconized mode seems to be fixed
---
 .../apache/openmeetings/web/room/sidebar/RoomSidebar.html  |  4 ++--
 openmeetings-web/src/main/webapp/css/room.css              | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
index f42c61d..f962f48 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
@@ -24,12 +24,12 @@
                <ul>
                        <li>
                                <a href="#room-sidebar-tab-users" 
class="om-icon big tab user" wicket:message="title:398">
-                                       <wicket:message key="398"/>&nbsp;<span 
wicket:id="user-count" class="badge">42</span>
+                                       <span class="label"><wicket:message 
key="398"/>&nbsp;</span><span wicket:id="user-count" class="badge">42</span>
                                </a>
                        </li>
                        <li wicket:enclosure="file-tab">
                                <a href="#room-sidebar-tab-files" 
class="om-icon big tab file" wicket:message="title:245" wicket:id="file-tab">
-                                       <wicket:message key="245"/>
+                                       <span class="label"><wicket:message 
key="245"/></span>
                                </a>
                        </li>
                        <div class="btn-dock" 
wicket:message="data-ttl-dock:label.dock.panel,data-ttl-undock:label.undock.panel"></div>
diff --git a/openmeetings-web/src/main/webapp/css/room.css 
b/openmeetings-web/src/main/webapp/css/room.css
index 8bae5c5..3663f0f 100644
--- a/openmeetings-web/src/main/webapp/css/room.css
+++ b/openmeetings-web/src/main/webapp/css/room.css
@@ -89,7 +89,7 @@
        width: 28px;
 }
 .room.sidebar {
-       min-width: 150px;
+       min-width: 155px;
        width: 315px;
        position: absolute;
 }
@@ -394,10 +394,20 @@
        overflow: hidden;
        white-space: nowrap;
 }
+.room.holder.small .room.sidebar .tab.user.om-icon.big {
+       max-width: 20px;
+}
 .room.holder.small .room.sidebar .tab.om-icon.big {
        max-width: 0px;
        padding-right: 0;
 }
+.room.holder.small .room.sidebar .tab.om-icon.big .label {
+       display: none;
+}
+.room.holder.small .room.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
 {
@@ -472,7 +482,7 @@
 }
 @media screen and (max-width: 1280px) {
        .room.sidebar {
-               width: 150px;
+               width: 155px;
        }
        .room.holder .room.sidebar .tab.om-icon.big {
                max-width: 0px;

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.