3 files changed, 40 insertions, 84 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3b61ceab1..ecb9352ec 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -138,51 +138,10 @@ blockquote {
 	filter:alpha(opacity=100);
 }
 
-
-#langselector {
-	position: fixed; 
-	top: 3px; 
-	left: 5px; 
-	z-index:9999;
-	opacity: 0.3;
-	filter:alpha(opacity=30);
-
-
-}
-#langselector:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
-}
-
-/* this is not yet supported
-
-nav {
-	background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
-	background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
-	background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%);
-	background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
-	background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+nav,
+header {
 	opacity: $nav_float_min_opacity;
 	filter:alpha(opacity=$nav_percent_min_opacity);
-
-}
-
-nav:hover {
-	background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
-	background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
-	background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
-	background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
-	background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
-	opacity: 1.0;
-	filter:alpha(opacity=100);
-
-}
-*/
-
-nav #site-location {
-	color: #888a85;
-	font-size: 0.8em;
-	position: absolute;
 }
 
 .error-message {
@@ -213,10 +172,6 @@ nav #banner #logo-text a {
 }
 nav #banner #logo-text a:hover { text-decoration: none; }
 
-header #site-location {
-  display: none;
-}
-
 header #banner {
   overflow: hidden;
   text-align: center;
@@ -245,31 +200,6 @@ header #banner #logo-text {
   font-size: 22px;
 }
 
-.tabs {
-	height: 28px;
-	border-bottom: 1px solid #aaaaaa;
-	padding:0px;
-	width: 100%;
-}
-
-.tabs li { margin: 0px; list-style: none; }
-.tab {
-	display:block;
-	float:left;
-	margin-right: 15px ;
-}
-
-.tab.active {
-	color: #444444;
-}
-
-ul.tabs {
-	margin-top: 0px;
-	margin-bottom: 0px;
-	list-style-type: none;
-
-}
-
 /* footer */
 
 footer {
@@ -427,6 +357,10 @@ footer {
 	color: #444444;
 }
 
+.vcard {
+	padding: 8px;
+}
+
 .vcard .title {
 	margin-bottom: 5px;
 }
@@ -499,9 +433,9 @@ footer {
 
 
 #profile-photo-wrapper img {
-	width:175px;
-	height:175px;
 	padding: 12px;
+	width: 201px;
+	height: 201px;
 }
 
 #profile-in-dir-yes-label,
@@ -797,6 +731,7 @@ footer {
 
 #contact-block {
 	margin-top: 25px;
+	padding: 8px;
 }
 
 #contact-block-numcontacts {
@@ -806,8 +741,8 @@ footer {
 
 .contact-block-div {
 	float: left;
-	width: 52px;
-	height: 52px;
+	width: 50px;
+	height: 50px;
 }
 .contact-block-textdiv {
 	float: left;
@@ -1310,7 +1245,7 @@ brain is weird like that */
 	background-image:url("../../../../images/onoff.jpg");
 	background-repeat: no-repeat;
 	padding: 4px 2px 2px 2px;
-	height: 16px;
+	height: 24px;
 	text-decoration: none;
 }
 .field .onoff .off {
@@ -1500,6 +1435,9 @@ div.jGrowl div.info {
 	right: 15px;
 }
 
+div.jGrowl div.jGrowl-notification {
+    min-height: 60px;
+}
 
 #id_term_label {
 	width:75px;
@@ -2308,11 +2246,19 @@ blockquote {
 	background-color: $nav_active_icon_colour;
 }
 
-#expand-aside {
+#expand-aside,
+#expand-tabs {
 	color: $nav_active_icon_colour;
 	padding: 7px 10px;
 }
 
+#tabs-collapse-1 {
+	padding: 0px;
+	margin-bottom: 25px;
+	border-top: none;
+	box-shadow: none;
+}
+
 @media screen and (max-width: 767px) {
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
@@ -2326,8 +2272,8 @@ blockquote {
 	}
 
 	main {
-		left: -227px;
-		width: calc( 100% + 227px );
+		left: -231px;
+		width: calc( 100% + 231px );
 	}
 
 	main.region_1-on {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index bec7c55c8..c58711e94 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -1,5 +1,3 @@
-
-
 function cmtBbOpen(comment, id) {
 	if($(comment).hasClass('comment-edit-text-full')) {
 		$(".comment-edit-bb-" + id).show();
@@ -22,11 +20,23 @@ function cmtBbClose(comment, id) {
 
 $(document).ready(function() {
 
-$('[data-toggle=offcanvas]').click(function() {
+$('#expand-aside').click(function() {
 	$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
 	$('main').toggleClass('region_1-on');
 });
 
+if ($('aside').html().length == 0) {
+	$('#expand-aside').hide();
+}
+
+$('#expand-tabs').click(function() {
+	$('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
+});
+
+if($('#tabs-collapse-1').length == 0) {
+	$('#expand-tabs').hide();
+}
+
 $('.group-edit-icon').hover(
 	function() {
 		$(this).css('opacity','1.0');},
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 34c04e91c..fc9388f2e 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -27,7 +27,7 @@
 {{include file="field_input.tpl" field=$radius}}
 {{include file="field_input.tpl" field=$shadow}}
 {{include file="field_input.tpl" field=$converse_width}}
-{{* include file="field_input.tpl" field=$nav_min_opacity *}}
+{{include file="field_input.tpl" field=$nav_min_opacity}}
 {{include file="field_input.tpl" field=$top_photo}}
 {{include file="field_input.tpl" field=$reply_photo}}
 {{include file="field_checkbox.tpl" field=$sloppy_photos}}