merge

3 files changed, 31 insertions, 7 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 67aa6a3c1..3b61ceab1 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -7,6 +7,10 @@
 
 
 /* generals */
+html {
+	height: 100%;
+}
+
 body {
 	font-family: arial,freesans,sans-serif;
 	font-size: $body_font_size;
@@ -16,6 +20,7 @@ body {
 	background-size: cover;
 	color: $font_colour;
 	margin: 0px;
+	height: 100%;
 }
 .jslider {
 	font-family: arial,freesans,sans-serif;
@@ -74,6 +79,11 @@ input[type="submit"] {
 	text-decoration: none;
 }
 
+button, input, optgroup, select, textarea {
+	color: #000;
+}
+
+
 pre code {
 	border: none;
 }
@@ -239,7 +249,7 @@ header #banner #logo-text {
 	height: 28px;
 	border-bottom: 1px solid #aaaaaa;
 	padding:0px;
-	width: 90%; 
+	width: 100%;
 }
 
 .tabs li { margin: 0px; list-style: none; }
@@ -257,8 +267,7 @@ ul.tabs {
 	margin-top: 0px;
 	margin-bottom: 0px;
 	list-style-type: none;
-	padding: 0px;
-	padding-right: 8px;
+
 }
 
 /* footer */
@@ -2304,9 +2313,24 @@ blockquote {
 	padding: 7px 10px;
 }
 
-@media (max-width:767px) {
+@media screen and (max-width: 767px) {
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
 		border-right: 1px solid $nav_bd;
 	}
+
+	main {
+		-webkit-transition: all 0.25s ease-out;
+		-moz-transition: all 0.25s ease-out;
+		transition: all 0.25s ease-out;
+	}
+
+	main {
+		left: -227px;
+		width: calc( 100% + 227px );
+	}
+
+	main.region_1-on {
+		left: 0px;
+	}
 }
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 7e957a4f4..bec7c55c8 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -22,9 +22,9 @@ function cmtBbClose(comment, id) {
 
 $(document).ready(function() {
 
-$('[data-toggle=show_hide]').click(function() {
+$('[data-toggle=offcanvas]').click(function() {
 	$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
-	$('#region_1').toggleClass('hidden-xs');
+	$('main').toggleClass('region_1-on');
 });
 
 $('.group-edit-icon').hover(
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 8fb4de381..c3153a025 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -119,7 +119,7 @@ if(! $a->install) {
     if (! $converse_width)
     	$converse_width="1024px";
 	if(! $top_photo)
-		$top_photo = '64px';
+		$top_photo = '48px';
 	$pmenu_top = intval($top_photo) - 16 . 'px';
 	$wwtop = intval($top_photo) - 15 . 'px';
 	$comment_indent = intval($top_photo) + 10 . 'px';