aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-03-20 23:20:14 +0100
committerMario Vavti <mario@mariovavti.com>2017-03-20 23:20:14 +0100
commita6f232f2b0613b8114424034da8814cffb566dd7 (patch)
tree1a7e7dc73fb49269d90696d925fe521366e237e2
parentcbcd1954618da8ba7013a42fcec5bff531535ba9 (diff)
downloadvolse-hubzilla-a6f232f2b0613b8114424034da8814cffb566dd7.tar.gz
volse-hubzilla-a6f232f2b0613b8114424034da8814cffb566dd7.tar.bz2
volse-hubzilla-a6f232f2b0613b8114424034da8814cffb566dd7.zip
really fix fullscreen and fix some issues in chat
-rw-r--r--view/theme/redbasic/css/style.css11
-rw-r--r--view/theme/redbasic/js/redbasic.js2
-rw-r--r--view/tpl/chat.tpl18
3 files changed, 19 insertions, 12 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f233e9a76..fba5edc43 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1364,11 +1364,18 @@ img.mail-conv-sender-photo {
word-wrap: break-word;
}
+main.fullscreen {
+ left: 0px;
+ width: 100%;
+ height: 100vh;
+ max-width: none;
+}
+
main.fullscreen .generic-content-wrapper {
- position: fixed;
+ position: absolute;
+ width: 100%;
top: 0px;
left: 0px;
- width: 100%;
border-radius: 0px;
border-width: 0px;
}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 6aba457f1..995c7a504 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -74,7 +74,7 @@ $(document).ready(function() {
function makeFullScreen(full) {
if(typeof full=='undefined' || full == true) {
$('main').addClass('fullscreen');
- $('header, nav, aside, #fullscreen-btn').hide();
+ $('header, nav, aside, #fullscreen-btn').attr('style','display:none !important');;
$('#inline-btn').show();
}
else {
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 6a285dba4..22f3465bf 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -27,9 +27,9 @@
</div>
<div id="chat-submit-wrapper">
<div id="chat-submit" class="dropup pull-right">
- <button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-caret-up"></i></button>
+ <button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-cog"></i></button>
<button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
- <div class="dropdown-menu">
+ <div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="fa fa-circle online"></i>&nbsp;{{$online}}</a>
<a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away"><i class="fa fa-circle away"></i>&nbsp;{{$away}}</a>
<a class="dropdown-item" href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave"><i class="fa fa-circle leave"></i>&nbsp;{{$leave}}</a>
@@ -43,7 +43,7 @@
</div>
</div>
<div id="chat-tools" class="btn-toolbar pull-left">
- <div class="btn-group">
+ <div class="btn-group mr-2">
<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'chatText'); return false;">
<i class="fa fa-bold jot-icons"></i>
</button>
@@ -60,23 +60,23 @@
<i class="fa fa-terminal jot-icons"></i>
</button>
</div>
- <div class="btn-group d-none d-md-table-cell">
+ <div class="btn-group mr-2 d-none d-md-flex">
<button id="chat-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="chatJotGetLink(); return false;" >
<i id="chat-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
</button>
</div>
{{if $feature_encrypt}}
- <div class="btn-group d-none d-md-table-cell">
+ <div class="btn-group mr-2 d-none d-md-flex">
<button id="chat-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}', '#chatText', $('#chatText').val()); return false;">
<i id="chat-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
</button>
</div>
{{/if}}
- <div class="btn-group dropup visible-xs">
+ <div class="btn-group dropup d-md-none">
<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
- <i id="more-tools-icon" class="fa fa-caret-up jot-icons"></i>
+ <i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
</button>
- <div class="dropdown-menu dropdown-menu-right">
+ <div class="dropdown-menu">
<a class="dropdown-item" href="#" onclick="chatJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a>
{{if $feature_encrypt}}
<div class="dropdown-divider"></div>
@@ -150,7 +150,7 @@ function update_inroom(inroom) {
$.each( inroom, function(index, item) {
var newNode = document.createElement('div');
newNode.setAttribute('class', 'member-item');
- $(newNode).html('<img class="dropdown-menu-img-xs" src="' + item.img + '" alt="' + item.name + '" /> ' + '<span class="contactname">' + item.name + '</span><span class="' + item.status_class + '">' + item.status + '</span>');
+ $(newNode).html('<img class="menu-img-2" src="' + item.img + '" alt="' + item.name + '" /> ' + '<span class="contactname">' + item.name + '</span><span class="' + item.status_class + '">' + item.status + '</span>');
html.appendChild(newNode);
});
memberChange = chatRoomMembersChange(inroom); // get list of arrivals and departures