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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
redmatrix 2016-04-28 18:29:37 -07:00
commit 37a852d2d1
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,6 +210,7 @@ header #banner #logo-text {
display: block; display: block;
position: fixed; position: fixed;
top: 51px; top: 51px;
width: 100%;
max-height: 50%; max-height: 50%;
background: $comment_item_colour; background: $comment_item_colour;
padding: 20px; padding: 20px;
@ -223,6 +224,24 @@ header #banner #logo-text {
.contextual-help-content dd { .contextual-help-content dd {
margin-bottom: 1em; 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 */ /* contextual help end */
/* footer */ /* footer */

9
view/tpl/nav.tpl
View File

@ -36,10 +36,6 @@
<li role="presentation" class="divider"></li> <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> <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}}
{{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}} {{if $nav.logout}}
<li role="presentation" class="divider"></li> <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> <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}} {{if $nav.help.6}}
<div id="contextual-help-content" class="contextual-help-content"> <div id="contextual-help-content" class="contextual-help-content">
{{$nav.help.5}} {{$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> </div>
{{/if}} {{/if}}