8 files changed, 95 insertions, 41 deletions
diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index 9d14beb33..faa18dfe5 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -1,4 +1,13 @@
 @media screen and (min-width: 760px) {
+
+	aside {
+		padding-top: 52px;
+	}
+
+	section {
+		padding-top: 52px;
+	}
+
 	.navbar-nav > li > a {
 		padding-top:7px !important;
 		padding-bottom:3px !important;
@@ -56,4 +65,8 @@
 		top: 30px;
 		right: 15px;
 	}
+
+	.contextual-help-content-open {
+		top: 32px;
+	}
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index de48ff74a..bd5df5e63 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -200,6 +200,31 @@ header #banner #logo-text {
   font-size: 22px;
 }
 
+/* contextual help */
+.contextual-help-content {
+	display: none;
+
+}
+
+.contextual-help-content-open {
+	display: block;
+	position: fixed;
+	top: 51px;
+	max-height: 50%;
+	background: $comment_item_colour;
+	padding: 20px;
+	border-bottom: #ccc 1px solid;
+	overflow: auto;
+	-moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
+	-webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
+	box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
+}
+
+.contextual-help-content dd {
+	margin-bottom: 1em;
+}
+/* contextual help end */
+
 /* footer */
 
 footer {
@@ -1675,7 +1700,7 @@ nav .badge.mail-update:hover {
 
 #expand-aside,
 #expand-tabs,
-#help-btn {
+#context-help-btn {
 	color: $nav_active_icon_colour;
 	padding: 7px 10px;
 }
@@ -1895,31 +1920,3 @@ nav .badge.mail-update:hover {
 .help-searchlist a {
 	font-size: 130%;
 }
-
-/* 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;
-}
-
-.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;
-}
-
-.help-content dd {
-	margin-bottom: 1em;
-}
-/* contextual help end */
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index b4cde6efc..877bcd840 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -67,15 +67,3 @@ function makeFullScreen(full) {
 		$('main').css({'transition': ''});
 	}
 }
-
-/* contextual help */
-$(document).mouseup(function (e) {
-        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'))
-        {
-            container.removeClass('help-content-open');
-        }
-});
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;
+}