From 837efcf5e73b7fbc81697bcb1257ef8cf6912cdd Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 20 Mar 2017 20:59:46 +0100
Subject: fix fullscreen and bbco_autocomplete popup rendering

---
 view/js/autocomplete.js            |  7 ++++++-
 view/theme/redbasic/css/style.css  | 12 +++---------
 view/theme/redbasic/js/redbasic.js |  9 +++------
 view/tpl/wiki.tpl                  |  2 +-
 4 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'view')

diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index e33f6192b..313e501e2 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -70,6 +70,10 @@ function smiley_format(item) {
 	return "<div class='dropdown-item'>" + item.icon + ' ' + item.text + "</div>";
 }
 
+function bbco_format(item) {
+	return "<div class='dropdown-item'>" + item + "</div>";
+}
+
 function editor_replace(item) {
 	if(typeof item.replace !== 'undefined') {
 		return '$1$2' + item.replace;
@@ -326,7 +330,8 @@ function string2bb(element) {
 				else {
 					return '\[' + element + '\] ';
 				}
-			}
+			},
+			template: bbco_format
 		};
 
 		this.attr('autocomplete','off');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b689b3209..3548e237f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1364,19 +1364,13 @@ 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: absolute;
-	width: 100%;
+	position: fixed;
 	top: 0px;
 	left: 0px;
+	width: 100%;
 	border-radius: 0px;
+	border-width: 0px;
 }
 
 main.fullscreen .section-title-wrapper {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index b522f8dd1..8106f913d 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -73,17 +73,14 @@ $(document).ready(function() {
 
 function makeFullScreen(full) {
 	if(typeof full=='undefined' || full == true) {
-		$('main').css({'transition': 'none'}).addClass('fullscreen');
-		$('header, nav, aside, #fullscreen-btn').hide();
-		$('#tabs-collapse-1').css({'visibility': 'hidden'});
+		$('main').addClass('fullscreen');
+		$('header, nav, aside, #fullscreen-btn').css({'visibility': 'hidden'});
 		$('#inline-btn').show();
 	}
 	else {
 		$('main').removeClass('fullscreen');
-		$('header, nav, aside, #fullscreen-btn').show();
-		$('#tabs-collapse-1').css({'visibility': ''});
+		$('header, nav, aside, #fullscreen-btn').css({'visibility': ''});
 		$('#inline-btn').hide();
-		$('main').css({'transition': ''});
 		$(document.body).trigger("sticky_kit:recalc");
 	}
 }
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index c5778a644..27592a4b4 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -56,7 +56,7 @@
 				<div>
 					<div id="id_{{$commitMsg.0}}_wrapper" class="field input">
 						<div class="input-group">
-							<input class="widget-input" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
+							<input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
 							<div class="input-group-btn">
 								<button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
 							</div>
-- 
cgit v1.2.3