Merge branch 2.2RC2.2

9 files changed, 161 insertions, 49 deletions

diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index 6b09b031a..689b67168 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -53,10 +53,6 @@
 		top: 30px !important;
 	}
 
-	nav .badge {
-		top: -29px;
-	}
-
 	#jGrowl.top-right {
 		top: 30px;
 		right: 15px;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f10166abb..1a38c7f01 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -21,7 +21,6 @@ body {
 	background-size: cover;
 	color: $font_colour;
 	margin: 0px;
-	overflow-x: hidden;
 }
 
 aside {
@@ -50,6 +49,7 @@ main {
 	left: 0;
 	width: 100%;
 	height: 100%;
+	background: rgba(0, 0, 0, .5);
 	cursor: pointer;
 	z-index: 1029;
 }
@@ -142,15 +142,14 @@ input, optgroup, select, textarea {
 }
 
 .selected-doco-nav {
- font-weight: bold;
- text-shadow: 2px 2px 3px lightgray;
+	font-weight: bold;
+	text-shadow: 2px 2px 3px lightgray;
 }
 
 #doco-content img {
- width: 100%;
+	width: 100%;
 }
 
-
 #help-content pre code {
 	overflow-x: auto;
 	white-space: pre;
@@ -255,6 +254,7 @@ header #banner #logo-text {
 	display: block;
 	position: fixed;
 	top: 51px;
+	left: 0px;
 	width: 100%;
 	max-height: 50%;
 	background: $comment_item_colour;
@@ -1105,11 +1105,12 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
 .contact-block-content {
 	margin-top: 10px;
 }
-.contact-block-img.archived {
+.contact-block-img.archived, .app-deleted {
 	opacity: 0.3;
 	filter:alpha(opacity=30);
 }
 
+
 .profile-match-connect { margin-top: 5px; }
 
 .reshared-content { margin-left: 20px; }
@@ -1190,6 +1191,16 @@ margin-right: 50px;
 	color: $toolicon_colour;
 }
 
+.generic-icons-nav {
+	font-size: 1.2em;
+	margin-right: 7px;
+}
+
+nav .navbar-collapse.in .generic-icons,
+nav .navbar-collapse.collapsing .generic-icons {
+	color: $nav_active_icon_colour;
+}
+
 .admin-icons {
 	font-size: 1.2em;
 	color: $toolicon_colour;
@@ -1304,6 +1315,11 @@ img.mail-conv-sender-photo {
 	color: $toolicon_colour;
 }
 
+.jot-icons.jot-lock-warn {
+	color: darkorange;
+}
+
+
 /* conversation */
 .nsfw-wrap {
 	text-align: center;
@@ -1521,7 +1537,6 @@ img.mail-conv-sender-photo {
 
 /* nav bootstrap */
 
-
 nav img {
 	border-radius: $radiuspx;
 }
@@ -1744,22 +1759,11 @@ blockquote {
 	border-radius: $radiuspx;
 }
 
-nav .badge:hover {
-	background-color: #999;
-}
-
 nav .badge.home-update,
 nav .badge.notify-update,
 nav .badge.intro-update,
 nav .badge.mail-update {
-	background-color:#C9302C;
-}
-
-nav .badge.home-update:hover,
-nav .badge.notify-update:hover,
-nav .badge.intro-update:hover,
-nav .badge.mail-update:hover {
-	background-color:#D9534F;
+	background-color: #C9302C;
 }
 
 .dropdown-menu {
@@ -1824,14 +1828,25 @@ nav .badge.mail-update:hover {
 	background-color: $nav_active_icon_colour;
 }
 
-#expand-aside,
-#expand-tabs,
-#doco-return-to-top-btn,
-#context-help-btn {
+.navbar-toggle-extra {
+	color: $nav_active_icon_colour;
+	padding: 7px 10px;
+}
+
+.navbar-toggle-extra-left {
+	float: left;
+	margin-left: 15px;
+	margin-right: 0px;
 	color: $nav_active_icon_colour;
 	padding: 7px 10px;
 }
 
+a.navbar-toggle-extra:hover,
+a.navbar-toggle-extra-left:hover  {
+	color: $nav_active_icon_colour;
+	text-decoration: none;
+}
+
 .nav-tabs.nav-justified {
 	background-color: rgba(254,254,254,.5);
 	border-top-left-radius: 4px;
@@ -1870,7 +1885,6 @@ nav .badge.mail-update:hover {
 @media screen and (max-width: 767px) {
 
 	aside#region_1 {
-		background: rgba(0, 0, 0, .1);
 		border-right: 1px solid $nav_bd;
 	}
 
@@ -2097,3 +2111,23 @@ dl.bb-dl > dd > li {
 .nav-pills-stacked-icons:hover + a {
 	background-color: #eee;
 }
+
+.app-icon {
+	font-size: 80px;
+	color: $toolicon_colour;
+	text-shadow: 3px 3px 3px lightgrey;
+}
+
+.app-detail {
+	text-align: center;
+}
+
+#login-main, .rmagic-button {
+	max-width: 400px;
+	margin-top: 20px;
+	margin-left: auto;
+	margin-right: auto;
+}
+#permcat-index {
+	margin: 10px;
+}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 3ff0c43ae..81a95c68b 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -53,8 +53,8 @@ $(document).ready(function() {
 	});
 
 	$('.usermenu-head').click(function() {
-		if($('#navbar-collapse-1').hasClass('in')){
-			$('#navbar-collapse-1').removeClass('in');
+		if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('in')){
+			$('#navbar-collapse-1, #navbar-collapse-2').removeClass('in');
 		}
 	});
 	
@@ -99,11 +99,13 @@ function makeFullScreen(full) {
 function toggleAside() {
 	$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
 	if($('main').hasClass('region_1-on')){
+		$('html, body').css('overflow-x', '');
 		$('main').removeClass('region_1-on')
 		$('#overlay').remove();
 		$('#left_aside_wrapper').trigger("sticky_kit:detach");
 	}
 	else {
+		$('html, body').css('overflow-x', 'hidden');
 		$('main').addClass('region_1-on')
 		$('<div id="overlay"></div>').appendTo('section');
 		$('#left_aside_wrapper').stick_in_parent({
diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index 997b59750..95d5a2001 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -3,7 +3,9 @@
 /**
  *   * Name: Redbasic
  *   * Description: Hubzilla standard theme
- * 	 * Version: 1.0
+ *   * Version: 2.0
+ *   * MinVersion: 2.2RC
+ *   * MaxVersion: 3.0
  *   * Author: Fabrixxm
  *   * Maintainer: Mike Macgirvin
  *   * Maintainer: Mario Vavti
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 3179c7078..020bda363 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,19 +1,17 @@
 <?php
 
-head_add_css('library/font_awesome/css/font-awesome.min.css');
-head_add_css('library/bootstrap/css/bootstrap.min.css');
-head_add_css('library/bootstrap-tagsinput/bootstrap-tagsinput.css');
-head_add_css('view/css/bootstrap-red.css');
-head_add_css('library/datetimepicker/jquery.datetimepicker.css');
-//head_add_css('library/colorpicker/css/colorpicker.css');
-head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
+head_add_css('/library/font_awesome/css/font-awesome.min.css');
+head_add_css('/library/bootstrap/css/bootstrap.min.css');
+head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
+head_add_css('/view/css/bootstrap-red.css');
+head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
+head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 require_once('view/php/theme_init.php');
 
-head_add_js('library/bootstrap/js/bootstrap.min.js');
-head_add_js('library/bootbox/bootbox.min.js');
-head_add_js('library/bootstrap-tagsinput/bootstrap-tagsinput.js');
-head_add_js('library/datetimepicker/jquery.datetimepicker.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/js/bootstrap.min.js');
+head_add_js('/library/bootbox/bootbox.min.js');
+head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
+head_add_js('/library/datetimepicker/jquery.datetimepicker.js');
+head_add_js('/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
+
 
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index ed2714dfc..ebef68a52 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -417,7 +417,6 @@ pre {
 
 .contextual-help-content-open {
 	background: $nav_bg;
-	top: 50px;
 	border-bottom: #555 1px solid;
 	box-shadow: 0px 3px 3px rgba(85,85,85,0.2);
 }
@@ -433,3 +432,26 @@ pre {
 .contextual-help-tool i {
 	color: $link_colour;
 }
+
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #222;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #222;
+}
+
+
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index 7dd8125a4..915cc4e18 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -294,6 +294,25 @@ pre {
 
 .contextual-help-content-open {
 	background: #FFF;
-	top: 50px;
+}
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
 
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
 }
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #F5F5F5;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #F5F5F5;
+}
+
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index ca2e5b15a..7f3f99fce 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -367,7 +367,6 @@ pre {
 
 .contextual-help-content-open {
 	background: $nav_bg;
-	top: 50px;
 	border-bottom: #1C5419 1px solid;
 	box-shadow: 0px 3px 3px rgba(28,84,25,0.2);
 }
@@ -383,3 +382,23 @@ pre {
 .contextual-help-tool i {
 	color: $link_colour;
 }
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #143D12;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #143D12;
+}
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index a462c4d29..7e7f80f2f 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -340,7 +340,6 @@ pre {
 
 .contextual-help-content-open {
 	background: $nav_bg;
-	top: 50px;
 	border-bottom: #FFF 1px solid;
 	box-shadow: 0px 3px 3px rgba(255,255,255,0.2);
 }
@@ -356,3 +355,24 @@ pre {
 .contextual-help-tool i {
 	color: $link_colour;
 }
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #030303;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #030303;
+}
+