[openmeetings] branch master updated: [OPENMEETINGS-1909] styles are 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 4d152be  [OPENMEETINGS-1909] styles are fixed
4d152be is described below

commit 4d152beb54d1e0cf4fc226415bd1ed9016450276
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Thu Jul 26 17:24:02 2018 +0700

    [OPENMEETINGS-1909] styles are fixed
---
 openmeetings-web/src/main/webapp/css/menu.css | 51 ++++++++++++++++++++++++++-
 openmeetings-web/src/main/webapp/css/room.css | 48 -------------------------
 2 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/openmeetings-web/src/main/webapp/css/menu.css 
b/openmeetings-web/src/main/webapp/css/menu.css
index 24b0e2b..7281a57 100644
--- a/openmeetings-web/src/main/webapp/css/menu.css
+++ b/openmeetings-web/src/main/webapp/css/menu.css
@@ -45,8 +45,57 @@
        border: 0;
 }
 #menu .ui-menu {
-       z-index: 10000000;
+       z-index: 10000000; /*need to be in sync with .room.menu.right*/
 }
 .recording .ui-menu .ui-menu-item {
        display: block;
 }
+.room.menu .ui-menu .ui-menu-item {
+       padding-left: 5px;
+       padding-right: 0;
+}
+.room.menu .top.room.menu.exit {
+       padding-left: 0;
+}
+.room.menu.right {
+       position: absolute;
+       top: 0;
+       margin-right: 5px;
+       right: 0;
+       display: inline-block;
+       z-index: 10000001;
+}
+.room.menu.right .room {
+       float: right;
+       padding-top: 5px;
+       padding-right: 5px;
+}
+.room.menu.right .room.name {
+       font-weight: bold;
+}
+.room.menu.right .room.name.screen {
+       color: red;
+}
+.room.menu.right .room.demo {
+}
+.room.menu.right .icon {
+       width: 30px;
+       height: 30px;
+       background-repeat: no-repeat;
+       background-position: 5px 5px;
+       background-size: 22px;
+       float: right;
+       padding: 0;
+}
+.room.menu.right .icon.share {
+       background-image: url(images/monitor_go.png);
+}
+.room.menu.right .icon.shared {
+       background-image: url(images/shared.png);
+}
+.room.menu.right .icon .profile {
+       margin-top: 3px;
+}
+.room.menu.right .icon .profile img {
+       width: 28px;
+}
diff --git a/openmeetings-web/src/main/webapp/css/room.css 
b/openmeetings-web/src/main/webapp/css/room.css
index 0c2c4e1..96817ba 100644
--- a/openmeetings-web/src/main/webapp/css/room.css
+++ b/openmeetings-web/src/main/webapp/css/room.css
@@ -40,54 +40,6 @@
 .ui-icon.status-mod {
        background-image: url(images/status-mod.png);
 }
-.room.menu .ui-menu .ui-menu-item {
-       padding-left: 5px;
-       padding-right: 0;
-}
-.room.menu .top.room.menu.exit {
-       padding-left: 0;
-}
-.room.menu.right {
-       position: absolute;
-       top: 0px;
-       margin-right: 5px;
-       right: 0px;
-       display: inline-block;
-}
-.room.menu.right .room {
-       float: right;
-       padding-top: 5px;
-       padding-right: 5px;
-}
-.room.menu.right .room.name {
-       font-weight: bold;
-}
-.room.menu.right .room.name.screen {
-       color: red;
-}
-.room.menu.right .room.demo {
-}
-.room.menu.right .icon {
-       width: 30px;
-       height: 30px;
-       background-repeat: no-repeat;
-       background-position: 5px 5px;
-       background-size: 22px;
-       float: right;
-       padding: 0;
-}
-.room.menu.right .icon.share {
-       background-image: url(images/monitor_go.png);
-}
-.room.menu.right .icon.shared {
-       background-image: url(images/shared.png);
-}
-.room.menu.right .icon .profile {
-       margin-top: 3px;
-}
-.room.menu.right .icon .profile img {
-       width: 28px;
-}
 .room.sidebar {
        min-width: 155px;
        width: 315px;