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 2018/07/15 09:35:42 UTC
[openmeetings] 03/07: [OPENMEETINGS-1142] ctyles are improved
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
commit ca50e34b710abe262160dda05bc2456e4198dc5c
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Jun 27 18:08:07 2018 +0700
[OPENMEETINGS-1142] ctyles are improved
---
.../openmeetings/web/room/wb/InterviewWbPanel.html | 2 +-
openmeetings-web/src/main/webapp/css/room.css | 38 +++++++++++++++++++++-
openmeetings-web/src/main/webapp/css/wb.css | 26 ---------------
3 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
index 0f8cc83..8194818 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
@@ -23,7 +23,7 @@
<div class="pod-area" style="width: 1000px;height: 600px;">
<div class="pod-big"></div>
</div>
- <div style="border-radius: 20px; position: absolute; right: 30px; bottom: 30px;" class="rec-btn" wicket:message="data-title-start:913,data-title-stop:914">
+ <div class="rec-btn" wicket:message="data-title-start:913,data-title-stop:914">
</div>
</wicket:panel>
diff --git a/openmeetings-web/src/main/webapp/css/room.css b/openmeetings-web/src/main/webapp/css/room.css
index 44919fc..3ea79c1 100644
--- a/openmeetings-web/src/main/webapp/css/room.css
+++ b/openmeetings-web/src/main/webapp/css/room.css
@@ -532,11 +532,47 @@
.pod-area .pod-big.ui-hightlight {
box-shadow: 3px 3px 4px blue;
}
-
.width250 {
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: 20px;
+ position: absolute;
+ right: 200px;
+ bottom: 30px;
+}
+#quick-vote {
+ position: absolute;
+ right: 40px;
+ bottom: 40px;
+ padding: 5px;
+ background-color: aquamarine;
+}
+#quick-vote .control {
+ display: inline-block;
+ width: 40px;
+ height: 40px;
+ background-repeat: no-repeat;
+ background-size: 35px;
+ position: relative;
+}
+#quick-vote .control.pro {
+ background-image: url(images/add.png);
+}
+#quick-vote .control.con {
+ background-image: url(images/cancel.png);
+}
+#quick-vote .control .badge {
+ position: absolute;
+ right: 0;
+ bottom: 0;
+}
@media screen and (max-width: 1280px) {
.room.sidebar {
width: 155px;
diff --git a/openmeetings-web/src/main/webapp/css/wb.css b/openmeetings-web/src/main/webapp/css/wb.css
index fff1226..2f80575 100644
--- a/openmeetings-web/src/main/webapp/css/wb.css
+++ b/openmeetings-web/src/main/webapp/css/wb.css
@@ -291,29 +291,3 @@
.wb-area .wb-zoom button.up {
background-image: url(images/page_up.png);
}
-#quick-vote {
- position: absolute;
- right: 40px;
- bottom: 40px;
- padding: 5px;
- background-color: aquamarine;
-}
-#quick-vote .control {
- display: inline-block;
- width: 40px;
- height: 40px;
- background-repeat: no-repeat;
- background-size: 35px;
- position: relative;
-}
-#quick-vote .control.pro {
- background-image: url(images/add.png);
-}
-#quick-vote .control.con {
- background-image: url(images/cancel.png);
-}
-#quick-vote .control .badge {
- position: absolute;
- right: 0;
- bottom: 0;
-}