[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1142] recording button and quick poll are not overlapping video pods in interview room

[so...@apache.org]

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 bbce28b  [OPENMEETINGS-1142] recording button and quick poll are not overlapping video pods in interview room
bbce28b is described below

commit bbce28b1925cf6e945fd1dc29e636628b164a296
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Aug 2 18:09:49 2018 +0700

    [OPENMEETINGS-1142] recording button and quick poll are not overlapping video pods in interview room
---
 .../openmeetings/web/room/wb/raw-interview-area.js  |  3 ++-
 openmeetings-web/src/main/webapp/css/raw-room.css   | 21 ++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
index 2072e6c..14fc9e3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
@@ -56,10 +56,11 @@ var InterviewWbArea = function() {
 	}
 	function _resize(sbW, chW, w, h) {
 		if (!container || !_inited) return;
-		const hh = h - 5;
+		const hh = h - 5 - 40;//rec button height
 		container.width(w).height(h).css('left', (Settings.isRtl ? chW : sbW) + 'px');
 		area.width(w).height(hh);
 		pArea.width(w).height(hh);
+		rec.css('right', w / 2)
 		_resizePod();
 	}
 	function _setRecEnabled(en) {
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css b/openmeetings-web/src/main/webapp/css/raw-room.css
index 696af79..e5fe6e7 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -496,18 +496,14 @@ ul.settings-menu {
 	min-width: 250px;
 	max-width: 250px;
 }
-.room.box.interview #quick-vote {
-	z-index: 100;
-	right: 10px;
-}
 .room.box.interview .room.wb.area .wb-area .rec-btn {
 	z-index: 100;
 	border-radius: 30px;
 	position: absolute;
 	right: 200px;
-	bottom: 30px;
-	width: 50px;
-	height: 50px;
+	bottom: 0px;
+	width: 40px;
+	height: 40px;
 }
 .room.box.interview .room.wb.area .wb-area .rec-btn .ui-button-icon.ui-icon.stop
 , .room.box.interview .room.wb.area .wb-area .rec-btn .ui-button-icon.ui-icon.record
@@ -544,6 +540,17 @@ ul.settings-menu {
 	right: 0;
 	bottom: 0;
 }
+.room.box.interview #quick-vote {
+	z-index: 100;
+	right: 10px;
+	bottom: 0;
+	padding: 0px 5px 0px 5px;
+	height: 40px;
+}
+.room.box.interview #quick-vote .close {
+	display: inline-block;
+	float: right;
+}
 @media screen and (max-width: 1280px) {
 	.room.sidebar {
 		width: 155px;