harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix help button for collapsed state

Browse Source
This commit is contained in:
Mario Vavti 2016-04-21 23:19:17 +02:00
parent d7f4bfedd5
commit 96d19c09f3
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
view/theme/redbasic/css/style.css
View File

@ -1703,9 +1703,10 @@ nav .badge.mail-update:hover {
#expand-aside, #expand-aside,
#expand-tabs, #expand-tabs,
#help-btn { #help_nav_btn_collapsed {
color: $nav_active_icon_colour; color: $nav_active_icon_colour;
padding: 7px 10px; padding: 7px 10px;
text-decoration: none;
} }
.nav-tabs.nav-justified { .nav-tabs.nav-justified {

4
view/tpl/nav.tpl
View File

@ -11,7 +11,7 @@
<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1"> <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> <i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
</button> </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> <i class="icon-question"></i>
</a> </a>
{{if $userinfo}} {{if $userinfo}}
@ -191,7 +191,7 @@
{{/if}} {{/if}}
{{if $nav.help}} {{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> <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> </li>
{{/if}} {{/if}}

4
view/tpl/nav_header.tpl
View File

@ -13,14 +13,14 @@
&& container.hasClass('help-content-open')) && 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.hasClass('help-content-open')
)) { )) {
container.removeClass('help-content-open'); container.removeClass('help-content-open');
$('main').removeClass('help-content-open'); $('main').removeClass('help-content-open');
$('main').css('top', '') $('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')) { && !container.hasClass('help-content-open')) {
$('#help-content').addClass('help-content-open'); $('#help-content').addClass('help-content-open');
$('main').removeClass('help-content-open'); $('main').removeClass('help-content-open');