aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-11-09 07:06:31 +1100
committerRedMatrix <info@friendica.com>2014-11-09 07:06:31 +1100
commitec4e4b82e958e7ba5a4efc8c370917c3e10bcba0 (patch)
tree399cd4a1b79f61530924ea59670af0bdd6cee5be /view
parentb29a968be8df52cd7c9b6d5bebb618534788337c (diff)
parentb5fad9feefd0f261807222d8a4c42ead6253a65c (diff)
downloadvolse-hubzilla-ec4e4b82e958e7ba5a4efc8c370917c3e10bcba0.tar.gz
volse-hubzilla-ec4e4b82e958e7ba5a4efc8c370917c3e10bcba0.tar.bz2
volse-hubzilla-ec4e4b82e958e7ba5a4efc8c370917c3e10bcba0.zip
Merge pull request #680 from pafcu/master
Some hlighlighting on hover
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css4
-rwxr-xr-xview/tpl/nav.tpl4
2 files changed, 6 insertions, 2 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 156e16687..06f24eedd 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2143,6 +2143,10 @@ blockquote {
border-radius: $radiuspx;
}
+nav .badge:hover {
+ background-color: #999;
+}
+
.dropdown-menu {
font-size: $body_font_size;
border-radius: $radiuspx;
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index a8a7a7da7..53c68f1e0 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -47,11 +47,11 @@
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav navbar-left">
- {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
+ {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a></li>{{/if}}
{{if !$userinfo}}
{{if $nav.loginmenu}}
<li class="{{$nav.loginmenu.0.2}} hidden-xs">
- <a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a>
+ <a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
<ul class="dropdown-menu" role="menu">
{{foreach $nav.loginmenu as $loginmenu}}
<li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>