From 96d19c09f39b4d022741f9ba4def6a68c768946d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 21 Apr 2016 23:19:17 +0200
Subject: fix help button for collapsed state

---
 view/theme/redbasic/css/style.css | 3 ++-
 view/tpl/nav.tpl                  | 4 ++--
 view/tpl/nav_header.tpl           | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9072646d5..7fddc7a88 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1703,9 +1703,10 @@ nav .badge.mail-update:hover {
 
 #expand-aside,
 #expand-tabs,
-#help-btn {
+#help_nav_btn_collapsed {
 	color: $nav_active_icon_colour;
 	padding: 7px 10px;
+	text-decoration: none;
 }
 
 .nav-tabs.nav-justified {
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 8fc6279d3..69dd77368 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -11,7 +11,7 @@
 			<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}}>
+			<a class="navbar-toggle" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}_collapsed"{{if $nav.help.6}} onclick="return false;"{{/if}}>
 				<i class="icon-question"></i>
 			</a>
 			{{if $userinfo}}
@@ -191,7 +191,7 @@
 			{{/if}}
 
 			{{if $nav.help}}
-				<li class="{{$sel.help}}" class="hidden-xs">
+				<li class="{{$sel.help}} 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}}
diff --git a/view/tpl/nav_header.tpl b/view/tpl/nav_header.tpl
index be990765c..27713b55b 100644
--- a/view/tpl/nav_header.tpl
+++ b/view/tpl/nav_header.tpl
@@ -13,14 +13,14 @@
             && container.hasClass('help-content-open'))
             ||
             (
-                    ($('#help_nav_btn').is(e.target) || $('#help_nav_btn').has(e.target).length !== 0)
+                    ($('#help_nav_btn, #help_nav_btn_collapsed').is(e.target) || $('#help_nav_btn, #help_nav_btn_collapsed').has(e.target).length !== 0)
                     && container.hasClass('help-content-open')
                     )) {
       container.removeClass('help-content-open');
       $('main').removeClass('help-content-open');
       $('main').css('top', '')
     }
-    else if (($('#help_nav_btn').is(e.target) || $('#help_nav_btn').has(e.target).length !== 0)
+    else if (($('#help_nav_btn, #help_nav_btn_collapsed').is(e.target) || $('#help_nav_btn, #help_nav_btn_collapsed').has(e.target).length !== 0)
             && !container.hasClass('help-content-open')) {
       $('#help-content').addClass('help-content-open');
       $('main').removeClass('help-content-open');
-- 
cgit v1.2.3