diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-28 18:29:37 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-28 18:29:37 -0700 |
| commit | 37a852d2d17fe2a499eeacb64e4e223210979926 (patch) | |
| tree | c8bc8243f3dfdd2a8267bff4ae84575729875f71 | |
| parent | 59777333dd7950e972ae4af57cf1b6ecc4b764ff (diff) | |
| parent | b664af748e32f6e8f3d451e95fd8cb65940eca17 (diff) | |
| download | volse-hubzilla-37a852d2d17fe2a499eeacb64e4e223210979926.tar.gz volse-hubzilla-37a852d2d17fe2a499eeacb64e4e223210979926.tar.bz2 volse-hubzilla-37a852d2d17fe2a499eeacb64e4e223210979926.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | view/theme/redbasic/css/style.css | 19 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 9 |
2 files changed, 23 insertions, 5 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bd5df5e63..290a1a697 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -210,6 +210,7 @@ header #banner #logo-text { display: block; position: fixed; top: 51px; + width: 100%; max-height: 50%; background: $comment_item_colour; padding: 20px; @@ -223,6 +224,24 @@ header #banner #logo-text { .contextual-help-content dd { margin-bottom: 1em; } + +.contextual-help-tool { + padding: 7px; + filter: alpha(opacity=20); + opacity: .2; +} + +.contextual-help-tool:hover { + filter: alpha(opacity=50); + opacity: .5; + text-decoration: none; +} + +.contextual-help-tool i { + color: #000; + font-size: 16px; +} + /* contextual help end */ /* footer */ diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 03b48fd00..14fb8a982 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -36,10 +36,6 @@ <li role="presentation" class="divider"></li> <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a></li> {{/if}} - {{if $nav.help.6}} - <li role="presentation" class="divider"></li> - <li role="presentation"><a href="{{$nav.help.0}}" title="{{$nav.help.3}}" role="menuitem" id="{{$nav.help.4}}">{{$nav.help.1}}</a></li> - {{/if}} {{if $nav.logout}} <li role="presentation" class="divider"></li> <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a></li> @@ -207,6 +203,9 @@ {{if $nav.help.6}} <div id="contextual-help-content" class="contextual-help-content"> {{$nav.help.5}} - <button type="button" class="close" onclick="contextualHelp();">×</button> + <div class="pull-right"> + <a class="contextual-help-tool" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="icon-question"></i></a> + <a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="icon-remove"></i></a> + </div> </div> {{/if}} |