aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-04-21 23:55:38 +0200
committerMario Vavti <mario@mariovavti.com>2016-04-21 23:55:38 +0200
commitbd11b1d61a9fa76458367db1e38d23b0dd694f36 (patch)
treee4938272bd0b6a662f52940c95942022d03fece8
parent96d19c09f39b4d022741f9ba4def6a68c768946d (diff)
downloadvolse-hubzilla-bd11b1d61a9fa76458367db1e38d23b0dd694f36.tar.gz
volse-hubzilla-bd11b1d61a9fa76458367db1e38d23b0dd694f36.tar.bz2
volse-hubzilla-bd11b1d61a9fa76458367db1e38d23b0dd694f36.zip
indicate if we will be displayed contextual help or default help
-rw-r--r--view/theme/redbasic/css/style.css6
-rwxr-xr-xview/tpl/nav.tpl4
2 files changed, 7 insertions, 3 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7fddc7a88..6c883b7b6 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -202,7 +202,7 @@ header #banner #logo-text {
/* contextual help */
.help-content {
- background: $item_colour;
+ background: $comment_item_colour;
color: $font_colour;
position: fixed;
top: -50%;
@@ -226,6 +226,10 @@ header #banner #logo-text {
.help-content dd {
margin-bottom: 1em;
}
+
+.contextual-help-btn {
+ text-decoration: underline;
+}
/* contextual help end */
/* footer */
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 69dd77368..1c7f8f5b2 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}}>
- <i class="icon-question"></i>
+ {{if $nav.help.6}}<i class="icon-caret-down"></i>&nbsp;{{/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>
@@ -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}}><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-caret-down"></i>&nbsp;{{/if}}<i class="icon-question"></i></a>
</li>
{{/if}}
</ul>