aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-22 00:51:49 -0700
committerredmatrix <git@macgirvin.com>2016-04-22 00:51:49 -0700
commitc250cb955e36d8659664c06f8fbc4fe3ace922a4 (patch)
tree33c7dc6f23a7ee687e48a2fa5f0b9cca895c566f
parentf111275ddf757d2ddcc38cd36aa3dd9f5b322f81 (diff)
parentd66f6c8e8ce427a57e630e4fc87dce65207d7532 (diff)
downloadvolse-hubzilla-c250cb955e36d8659664c06f8fbc4fe3ace922a4.tar.gz
volse-hubzilla-c250cb955e36d8659664c06f8fbc4fe3ace922a4.tar.bz2
volse-hubzilla-c250cb955e36d8659664c06f8fbc4fe3ace922a4.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rwxr-xr-xview/tpl/nav.tpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 1c7f8f5b2..ff71c224d 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -12,7 +12,7 @@
<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="{{$nav.help.4}}_collapsed"{{if $nav.help.6}} onclick="return false;"{{/if}}>
- {{if $nav.help.6}}<i class="icon-caret-down"></i>&nbsp;{{/if}}<i class="icon-question"></i>
+ {{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}}
</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>
@@ -192,7 +192,7 @@
{{if $nav.help}}
<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}}>{{if $nav.help.6}}<i class="icon-caret-down"></i>&nbsp;{{/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}}>{{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}}</a>
</li>
{{/if}}
</ul>