Merge https://github.com/friendica/red into zpull

3 files changed, 4 insertions, 10 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 6a4f836b1..edc8eebbb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -113,15 +113,6 @@ blockquote {
 	padding: 5px;
 }
 
-#panel {
-	background-color: ivory;
-	position: absolute;
-	z-index: 2;
-	width: 30%;
-	padding: 25px;
-	border: 1px solid #444;
-}
-
 .heart {
 	color: #FF0000;
 	font-size: 100%;
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index c58711e94..70869f44b 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -30,6 +30,9 @@ if ($('aside').html().length == 0) {
 }
 
 $('#expand-tabs').click(function() {
+	if(!$('#tabs-collapse-1').hasClass('in')){
+		$('html, body').animate({ scrollTop: 0 }, 'slow');
+	}
 	$('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
 });
 
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 552399329..2da04a389 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -15,5 +15,5 @@ head_add_js('library/bootstrap-datetimepicker/js/moment.js');
 head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
 //head_add_js('library/colorpicker/js/colorpicker.js');
 head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
-head_add_js('library/bootstrap-colorpicker/src/js/docs.js');
+//head_add_js('library/bootstrap-colorpicker/src/js/docs.js');