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 2017/08/01 12:48:55 UTC
openmeetings git commit: [OPENMEETINGS-1676] iconize on resize is
added
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x 59c689b61 -> 6ada5d8ef
[OPENMEETINGS-1676] iconize on resize is added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6ada5d8e
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6ada5d8e
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6ada5d8e
Branch: refs/heads/3.3.x
Commit: 6ada5d8ef57129bb423a06f39cbeacde25b85b61
Parents: 59c689b
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Aug 1 19:48:46 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Aug 1 19:48:46 2017 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/web/room/room.js | 6 +++
openmeetings-web/src/main/webapp/css/room.css | 43 ++++++++++++++++----
2 files changed, 40 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ada5d8e/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
index a072f05..aa81d89 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
@@ -26,6 +26,12 @@ function setRoomSizes() {
p.height(hh);
$(".user.list", p).height(hh - $("ul", p).height() - $(".user.header", p).height() - 5);
+ var holder = $('.room.holder');
+ if (sb.width() > 230) {
+ holder.addClass('big').removeClass('small');
+ } else {
+ holder.removeClass('big').addClass('small');
+ }
var container = $(".room.wb.area")
, area = container.find(".wb-area");
container.width(w).height(h).css('left', sb.width() + 5 + "px");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ada5d8e/openmeetings-web/src/main/webapp/css/room.css
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/css/room.css b/openmeetings-web/src/main/webapp/css/room.css
index ce5f83b..42ae447 100644
--- a/openmeetings-web/src/main/webapp/css/room.css
+++ b/openmeetings-web/src/main/webapp/css/room.css
@@ -86,7 +86,7 @@
width: 28px;
}
.room.sidebar.left {
- min-width: 200px;
+ min-width: 150px;
width: 315px;
position: absolute;
}
@@ -223,6 +223,9 @@
padding-left: 44px;
overflow: hidden;
}
+.room.holder.small .room.sidebar.left .user.list .user.name {
+ display: none;
+}
.room.sidebar.left .user.list .user .actions {
position: relative;
min-height: 18px;
@@ -372,6 +375,15 @@
overflow: hidden;
white-space: nowrap;
}
+.room.holder.small .room.sidebar.left .tab.om-icon.big {
+ max-width: 0px;
+ padding-right: 0;
+}
+.room.holder.small .room.sidebar.left .file.tree .file.item .name
+ , .room.holder.small .room.sidebar.left .file.tree .file.item .name span
+{
+ width: 40px;
+}
.room.sidebar.left .tab.om-icon.big.user {
background-image: url(images/group.png);
}
@@ -513,25 +525,38 @@
@media screen and (max-width: 1280px) {
.room.sidebar.left {
width: 150px;
- min-width: 150px;
}
- .room.sidebar.left .tab.om-icon.big {
+ .room.holder .room.sidebar.left .tab.om-icon.big {
max-width: 0px;
padding-right: 0;
}
- .room.sidebar.left .user.list .user.name {
+ .room.holder.big .room.sidebar.left .tab.om-icon.big {
+ max-width: 80px;
+ padding: 0em 1em 0 2.5em;
+ }
+ .room.holder .room.sidebar.left .user.list .user.name {
display: none;
}
- .room.sidebar.left .file.tree .file.item .name, .room.sidebar.left .file.tree .file.item .name span {
+ .room.holder.big .room.sidebar.left .user.list .user.name {
+ display: block;
+ }
+ .room.holder .room.sidebar.left .file.tree .file.item .name
+ , .room.holder .room.sidebar.left .file.tree .file.item .name span
+ {
width: 40px;
}
+ .room.holder.big .room.sidebar.left .file.tree .file.item .name
+ , .room.holder.big .room.sidebar.left .file.tree .file.item .name span
+ {
+ width: 230px;
+ }
.room.sidebar.left .file.tree .file.item .name span {
padding: 0;
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
}
- .room.sidebar.left .file.tree .file.item {
+ .room.holder .room.sidebar.left .file.tree .file.item {
width: 80px;
}
+ .room.holder.big .room.sidebar.left .file.tree .file.item {
+ width: auto;
+ }
}