[openmeetings] branch master updated: [OPENMEETINGS-1854] Timer is better positioned and styled

[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 3748038  [OPENMEETINGS-1854] Timer is better positioned and styled
3748038 is described below

commit 37480383160dc648dadf02ea19e0392c3f63e552
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Thu Mar 22 23:43:52 2018 +0700

    [OPENMEETINGS-1854] Timer is better positioned and styled
---
 .../main/java/org/apache/openmeetings/web/room/VideoSettings.html | 3 ++-
 .../main/java/org/apache/openmeetings/web/room/settings-base.js   | 2 +-
 openmeetings-web/src/main/webapp/css/room.css                     | 8 +++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
index fc8e49e..83f6420 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
@@ -72,12 +72,13 @@
                        </div>
                        <div class="vid-block">
                                <div class="video-conainer">
-                                       <div class="timer"><span 
class="time"></span>&nbsp;<wicket:message key="network.test.sec"/></div>
                                        <video autoplay="autoplay"></video>
                                </div>
                                <div class="level-meter" 
wicket:message="title:767"></div>
                                <div class="sett-row right">
+                                       <div class="timer 
ui-widget-header"><span class="time"></span>&nbsp;<wicket:message 
key="network.test.sec"/></div>
                                        <div><button 
class="play"><wicket:message key="764"/></button></div>
+                                       <div class="clear"></div>
                                </div>
                        </div>
                </div>
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
index 88319d1..13c90ee 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
@@ -117,7 +117,7 @@ var VideoSettings = (function() {
                mic = vs.find('select.mic');
                res = vs.find('select.cam-resolution');
                vidScroll = vs.find('.vid-block .video-conainer');
-               timer = vidScroll.find('.timer');
+               timer = vs.find('.timer');
                vid = vidScroll.find('video');
                recBtn = vs.find('.rec-start').click(function() {
                        recBtn.prop('disabled', true).button('refresh');
diff --git a/openmeetings-web/src/main/webapp/css/room.css 
b/openmeetings-web/src/main/webapp/css/room.css
index 7fcfb8b..b3d50e4 100644
--- a/openmeetings-web/src/main/webapp/css/room.css
+++ b/openmeetings-web/src/main/webapp/css/room.css
@@ -351,11 +351,9 @@
        max-height: 300px;
        position: relative;
 }
-.ui-dialog.video .vid-block .video-conainer .timer {
-       background-color:grey;
-       width: 2.2em;
-       height: 1em;
-       position:absolute;
+.sett-container .vid-block .timer {
+       float: left;
+       padding: 2px 4px;
 }
 .ui-dialog.video .sett-row select, .ui-dialog.video .level-meter {
        width: 250px;

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