some fixes for contextual help and disable transition animation for now - it looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now.

3 files changed, 46 insertions, 49 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 038bffb2f..9072646d5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -200,6 +200,34 @@ header #banner #logo-text {
   font-size: 22px;
 }
 
+/* contextual help */
+.help-content {
+	background: $item_colour;
+	color: $font_colour;
+	position: fixed;
+	top: -50%;
+	left: 0px;
+	width: 100%;
+	max-height: 50%;
+	padding: 20px;
+	/*transition: top 300ms cubic-bezier(0.17, 0.04, 0.03, 0.94);*/
+	border-bottom: #CCC 1px solid;
+	overflow: auto;
+}
+
+.help-content-open {
+	top: 51px;
+	-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);
+	/*transition: top 300ms cubic-bezier(0.17, 0.04, 0.03, 0.94);*/
+}
+
+.help-content dd {
+	margin-bottom: 1em;
+}
+/* contextual help end */
+
 /* footer */
 
 footer {
@@ -1895,38 +1923,3 @@ nav .badge.mail-update:hover {
 .help-searchlist a {
 	font-size: 130%;
 }
-
-/* contextual help */
-.help-content {
-  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 {
-  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;
-}
-/* contextual help end */
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 0d70ac5be..8fc6279d3 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+	<div class="container-fluid">
 		<div class="navbar-header">
 			<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
 				<span class="icon-bar"></span>
@@ -11,6 +11,9 @@
 			<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1">
 				<i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
 			</button>
+			<a class="navbar-toggle" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="help-btn"{{if $nav.help.6}} onclick="return false;"{{/if}}>
+				<i class="icon-question"></i>
+			</a>
 			{{if $userinfo}}
 				<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span>
 				{{if $localuser}}
@@ -188,15 +191,16 @@
 			{{/if}}
 
 			{{if $nav.help}}
-				<li class="{{$sel.help}}">
-                                  <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="{{if $nav.help.6}}return false;{{/if}}"><i class="icon-question"></i></a>
-				</li>
-                                
-			<div id="help-content" class="help-content">
-                            {{$nav.help.5}}
-                            <p class="pull-right"><a href="{{$nav.help.0}}">Click here for more documentation...</a></p>
-			</div>
+				<li class="{{$sel.help}}" class="hidden-xs">
+					<a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="return false;"{{/if}}><i class="icon-question"></i></a>
+				</li>
 			{{/if}}
 			</ul>
 		</div>
 	</div>
+	{{if $nav.help.6}}
+	<div id="help-content" class="help-content">
+		{{$nav.help.5}}
+		<p class="pull-right"><a href="{{$nav.help.0}}">Click here for more documentation...</a></p>
+	</div>
+	{{/if}}
diff --git a/view/tpl/nav_header.tpl b/view/tpl/nav_header.tpl
index 5fce26317..be990765c 100644
--- a/view/tpl/nav_header.tpl
+++ b/view/tpl/nav_header.tpl
@@ -18,18 +18,18 @@
                     )) {
       container.removeClass('help-content-open');
       $('main').removeClass('help-content-open');
-      $('main').css('top', 'auto')
+      $('main').css('top', '')
     }
     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();
+      if ($('#navbar-collapse-1').outerHeight(true) < $('#help-content').height()) {
+        mainTop = $('#help-content').outerHeight(true);
       }
 
-      $('main').css('top', +mainTop + +50 + 'px');
+      $('main').css('top', mainTop + 'px');
     }
 
   });
@@ -46,4 +46,4 @@
       $(target).fadeTo('slow', 0.1).fadeTo('slow', 1.0);
     }
   }
-</script>
\ No newline at end of file
+</script>