Merge branch 'master' into dev

2 files changed, 48 insertions, 15 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 903900e7f..de48ff74a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1108,22 +1108,15 @@ img.mail-conv-sender-photo {
 }
 
 #profile-jot-text {
-	resize: none;
-	border-width: 0px;
 	border-radius: $radiuspx;
 }
 
-#profile-jot-text:focus {
-	resize: vertical;
-}
-
-
 #profile-jot-text::-webkit-input-placeholder {
-	font-size:16px;
+	font-size: 16px;
 }
 
 #profile-jot-text::-moz-placeholder {
-	font-size:16px;
+	font-size: 16px;
 }
 
 #profile-jot-text:focus::-webkit-input-placeholder {
@@ -1681,7 +1674,8 @@ nav .badge.mail-update:hover {
 }
 
 #expand-aside,
-#expand-tabs {
+#expand-tabs,
+#help-btn {
 	color: $nav_active_icon_colour;
 	padding: 7px 10px;
 }
@@ -1815,7 +1809,10 @@ nav .badge.mail-update:hover {
 }
 
 /* Abusing theme-green is less work than makeing a new new one */
-.theme-green .back-bar .selected-bar { background-color: #000000; background-image: none; !important }
+.theme-green .back-bar .selected-bar {
+	background-color: #000000;
+	background-image: none !important;
+}
 
 
 /* Turn checkboxes into switches */
@@ -1891,10 +1888,6 @@ nav .badge.mail-update:hover {
     background-color: #337AB7;
 }
 
-/*.channels_ckbx, .pending_ckbx, .users_ckbx {
-	margin-top: -5px !important;
-}*/
-
 .help-searchlist {
 	list-style-type: none;
 }
@@ -1902,3 +1895,31 @@ 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 877bcd840..b4cde6efc 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -67,3 +67,15 @@ 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');
+        }
+});