Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge

2 files changed, 13 insertions, 9 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9dcfcdf3e..903900e7f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1518,21 +1518,27 @@ nav .dropdown-menu {
 	word-wrap: break-word;
 }
 
-.generic-content-wrapper.fullscreen {
-	position: absolute;
+main.fullscreen {
+	left: 0px;
 	width: 100%;
 	height: 100%;
+	max-width: none;
+}
+
+main.fullscreen .generic-content-wrapper {
+	position: absolute;
+	width: 100%;
 	top: 0px;
 	left: 0px;
-	border: 0px;
 	border-radius: 0px;
 }
 
-.generic-content-wrapper.fullscreen .section-title-wrapper {
+main.fullscreen .section-title-wrapper {
 	border-radius: 0px;
 }
 
-.generic-content-wrapper.fullscreen .section-content-wrapper {
+main.fullscreen .section-content-wrapper,
+main.fullscreen .section-content-wrapper-np {
 	border-radius: 0px;
 }
 
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 73628ebd9..877bcd840 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -55,15 +55,13 @@ $(document).ready(function() {
 
 function makeFullScreen(full) {
 	if(typeof full=='undefined' || full == true) {
-		$('main').css({'transition': 'none', 'left': '0px', 'width': '100%', 'max-width': 'none'});
-		$('.generic-content-wrapper').addClass('fullscreen');
+		$('main').css({'transition': 'none'}).addClass('fullscreen');
 		$('#fullscreen-btn, header, nav, aside').css({'display': 'none'});
 		$('#inline-btn').show();
 
 	}
 	else {
-		$('main').css({'left': '', 'width': '', 'max-width': ''});
-		$('.generic-content-wrapper').removeClass('fullscreen');
+		$('main').removeClass('fullscreen');
 		$('#fullscreen-btn, header, nav, aside').css({'display': ''});
 		$('#inline-btn').hide();
 		$('main').css({'transition': ''});