Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

7 files changed, 123 insertions, 25 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index de48ff74a..038bffb2f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1898,28 +1898,35 @@ nav .badge.mail-update:hover {
 
 /* contextual help */
 .help-content {
-	background: rgba(255, 255, 255, 0.9);
-	color: #333333;
-	position: fixed;
-	top: 50px;
-	left: -80%;
-	width: 80%;
-        height: 60%;
-	padding: 20px;
-	transition: left 300ms cubic-bezier(0.17, 0.04, 0.03, 0.94);
-	box-sizing: border-box;
-	border: #CCC thin solid;
-        overflow: auto;
+  background: $bgcolour;
+  color: $font_colour;
+  position: fixed;
+  top: -1000px;
+  left: 0%;
+  right: 100%;
+  width: 100%;
+  height: auto;
+  padding: 20px;
+  transition: top 300ms cubic-bezier(0.17, 0.04, 0.03, 0.94);
+  box-sizing: border-box;
+  border-bottom: #CCC thin solid;
+  overflow: auto;
 }
 
 .help-content-open {
-	left: 0px;
-	-moz-box-shadow: 3px 3px 3px #ccc;
-	-webkit-box-shadow: 3px 3px 3px #ccc;
-	box-shadow: 3px 3px 3px #ccc;
+  top: 50px;
+  -moz-box-shadow: 0px 3px 3px #ccc;
+  -webkit-box-shadow: 0px 3px 3px #ccc;
+  box-shadow: 0px 3px 3px #ccc;
+}
+main {
+  top: auto;
+}
+main.help-content-open {
+  top: 200px;
 }
 
 .help-content dd {
-	margin-bottom: 1em;
+  margin-bottom: 1em;
 }
 /* contextual help end */
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index b4cde6efc..ccc24d2b3 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -69,13 +69,48 @@ function makeFullScreen(full) {
 }
 
 /* contextual help */
-$(document).mouseup(function (e) {
-        var container = $("#help-content");
+$('.help-content').css('top', '-' + $('#help-content').height() + 'px')
+$(document).mouseup(function (e)
+{
+  e.preventDefault;
+
+  var container = $("#help-content");
+
+  if ((!container.is(e.target) // if the target of the click isn't the container...
+          && container.has(e.target).length === 0 // ... nor a descendant of the container
+          && container.hasClass('help-content-open'))
+          ||
+          (
+                  ($('#help_nav_btn').is(e.target) || $('#help_nav_btn').has(e.target).length !== 0)
+                  && container.hasClass('help-content-open')
+                  )) {
+    container.removeClass('help-content-open');
+    $('main').removeClass('help-content-open');
+    $('main').css('top', 'auto')
+  }
+  else if (($('#help_nav_btn').is(e.target) || $('#help_nav_btn').has(e.target).length !== 0)
+          && !container.hasClass('help-content-open')) {
+    $('#help-content').addClass('help-content-open');
+    $('main').removeClass('help-content-open');
+    var mainTop = $('#navbar-collapse-1').height();
+    if ($('#navbar-collapse-1').height() < $('#help-content').height()) {
+      mainTop = $('#help-content').height();
+    }
+
+    $('main').css('top', +mainTop + +50 + 'px');
+  }
 
-        if (!container.is(e.target) // if the target of the click isn't the container...
-                && container.has(e.target).length === 0 // ... nor a descendant of the container
-                && container.hasClass('help-content-open'))
-        {
-            container.removeClass('help-content-open');
-        }
 });
+
+var contextualHelpFocus = function (target, openSidePanel) {
+  if (openSidePanel) {
+    $("main").addClass('region_1-on');  // Open the side panel to highlight element 
+  } else {
+    $("main").removeClass('region_1-on');
+  }
+  // Animate the page scroll to the element and then pulse the element to direct attention
+  $('html,body').animate({scrollTop: $(target).offset().top - $('#navbar-collapse-1').height() - $('#help-content').height() - 50}, 'slow');
+  for (i = 0; i < 3; i++) {
+    $(target).fadeTo('slow', 0.1).fadeTo('slow', 1.0);
+  }
+}
\ No newline at end of file
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 36e26302a..471bed5e4 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -464,4 +464,19 @@ a:hover > .icon-trash {
 	}
 }
 
+.help-content {
+	color: #FFF;
+	border: none;
+}
+
+.help-content a {
+	color: #FFF;
+	font-weight: 600;
+}
+
+.help-content-open {
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
 
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 6ed2501e1..fb18a4159 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -360,3 +360,14 @@ pre {
 .table > tbody > tr > td {
 	border-color: #888;
 }
+
+.help-content {
+	border-bottom: #222 thin solid;
+}
+
+.help-content-open {
+  	-moz-box-shadow: 0px 3px 3px #222;
+  	-webkit-box-shadow: 0px 3px 3px #222;
+  	box-shadow: 0px 3px 3px #222;
+}
+
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index ba9771a40..e5cfb5f46 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -275,3 +275,13 @@ pre {
 	background-color: inherit;
 	border: none;
 }
+
+.help-content {
+	border-bottom: #000 thin solid;
+}
+
+.help-content-open {
+  	-moz-box-shadow: none;
+  	-webkit-box-shadow: none;
+  	box-shadow: none;
+}
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index e6901143b..7e3f901ef 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -305,3 +305,13 @@ pre {
 .table > tbody > tr > td {
 	border-color: #143D12;
 }
+
+.help-content {
+	border-bottom: #143D12 thin solid;
+}
+
+.help-content-open {
+  	-moz-box-shadow: none;
+  	-webkit-box-shadow: none;
+  	box-shadow: none;
+}
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index a2d024881..d86154297 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -279,3 +279,13 @@ pre {
 .table > tbody > tr > td {
 	border-color: #FFF;
 }
+
+.help-content {
+	border-bottom: #FFF thin solid;
+}
+
+.help-content-open {
+  	-moz-box-shadow: none;
+  	-webkit-box-shadow: none;
+  	box-shadow: none;
+}