Permalink
Browse files

clean up some funky menu interactions

  • Loading branch information...
1 parent 3d299f0 commit 863dcda8ee2e6a193729b4cb74a0bb60d364372b @friendica committed Mar 7, 2013
Showing with 20 additions and 20 deletions.
  1. +2 −2 js/main.js
  2. +6 −6 view/theme/redbasic/css/style.css
  3. +6 −6 view/tpl/nav.tpl
  4. +6 −6 view/tpl/smarty3/nav.tpl
View
@@ -162,7 +162,7 @@
function close_last_popup_menu() {
if(last_popup_menu) {
last_popup_menu.hide();
- last_popup_button.removeClass("selected");
+/* last_popup_button.removeClass("selected"); */
last_popup_menu = null;
last_popup_button = null;
}
@@ -187,7 +187,7 @@
e.preventDefault();
e.stopPropagation();
if (menu.attr('popup')=="false") return false;
- $(w).parent().toggleClass("selected");
+/* $(w).parent().toggleClass("selected"); */
/* notification menus are loaded dynamically
* - here we find a rel tag to figure out what type of notification to load */
var loader_source = $(menu).attr('rel');
@@ -3479,10 +3479,6 @@ nav:hover .nav-menu {
/* border-bottom: 3px solid #f00; */
}
-nav .nav-menu.selected span {
- color: #444444;
-}
-
nav .nav-menu.selected a {
color: #444444;
}
@@ -3497,6 +3493,10 @@ nav .nav-notify {
filter:alpha(opacity=60);
}
+.nav-notify:hover, nav .nav-notify.selected span {
+ color: #ffffff;
+}
+
nav .nav-notify.show {
display: block;
}
@@ -3538,15 +3538,15 @@ ul.menu-popup {
}
ul.menu-popup a {
display: block;
- color: #;
+ color: #FFFFFF;
padding: 5px 10px;
text-decoration: none;
}
ul.menu-popup a:hover {
background-color: #888888;
- color: #000000;
+ color: #FFFFFF;
}
ul.menu-popup .menu-sep {
border-top: 1px solid #9eabb0;
View
@@ -36,7 +36,7 @@
{{ if $nav.network }}
<li id="nav-network-link" class="nav-menu $sel.network">
- <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" ><span class="network">$nav.network.1</span></a>
+ <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
<span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span>
<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
<li id="nav-network-see-all"><a href="$nav.network.all.0">$nav.network.all.1</a></li>
@@ -48,7 +48,7 @@
{{ if $nav.home }}
<li id="nav-home-link" class="nav-menu $sel.home">
- <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" ><span class="home">$nav.home.1</span></a>
+ <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span>
<ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
<li id="nav-home-see-all"><a href="$nav.home.all.0">$nav.home.all.1</a></li>
@@ -60,7 +60,7 @@
{{ if $nav.messages }}
<li id="nav-mail-link" class="nav-menu $sel.messages">
- <a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" ><span class="mail">$nav.messages.1</span></a>
+ <a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
<span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
<ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
<li id="nav-messages-see-all"><a href="$nav.messages.all.0">$nav.messages.all.1</a></li>
@@ -72,7 +72,7 @@
{{ if $nav.all_events }}
<li id="nav-all_events-link" class="nav-menu $sel.all_events">
- <a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" ><span class="events">$nav.all_events.1</span></a>
+ <a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" >$nav.all_events.1</a>
<span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span>
<ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events">
<li id="nav-all_events-see-all"><a href="$nav.all_events.all.0">$nav.all_events.all.1</a></li>
@@ -84,7 +84,7 @@
{{ if $nav.intros }}
<li id="nav-intros-link" class="nav-menu $sel.intros">
- <a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" ><span class="introductions">$nav.intros.1</span></a>
+ <a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" >$nav.intros.1</a>
<span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span>
<ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros">
<li id="nav-intros-see-all"><a href="$nav.intros.all.0">$nav.intros.all.1</a></li>
@@ -95,7 +95,7 @@
{{ if $nav.notifications }}
<li id="nav-notify-linkmenu" class="nav-menu fakelink">
- <a href="$nav.notifications.0" title="$nav.notifications.1"><span class="notify">$nav.notifications.1</span></a>
+ <a href="$nav.notifications.0" title="$nav.notifications.1">$nav.notifications.1</a>
<span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span>
<ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify">
<li id="nav-notify-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
View
@@ -41,7 +41,7 @@
{{if $nav.network}}
<li id="nav-network-link" class="nav-menu {{$sel.network}}">
- <a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><span class="network">{{$nav.network.1}}</span></a>
+ <a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
<span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span>
<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
<li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li>
@@ -53,7 +53,7 @@
{{if $nav.home}}
<li id="nav-home-link" class="nav-menu {{$sel.home}}">
- <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><span class="home">{{$nav.home.1}}</span></a>
+ <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
<span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span>
<ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
<li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li>
@@ -65,7 +65,7 @@
{{if $nav.messages}}
<li id="nav-mail-link" class="nav-menu {{$sel.messages}}">
- <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><span class="mail">{{$nav.messages.1}}</span></a>
+ <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
<span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
<ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
<li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li>
@@ -77,7 +77,7 @@
{{if $nav.all_events}}
<li id="nav-all_events-link" class="nav-menu {{$sel.all_events}}">
- <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><span class="events">{{$nav.all_events.1}}</span></a>
+ <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" >{{$nav.all_events.1}}</a>
<span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span>
<ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events">
<li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li>
@@ -89,7 +89,7 @@
{{if $nav.intros}}
<li id="nav-intros-link" class="nav-menu {{$sel.intros}}">
- <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><span class="introductions">{{$nav.intros.1}}</span></a>
+ <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" >{{$nav.intros.1}}</a>
<span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span>
<ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros">
<li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li>
@@ -100,7 +100,7 @@
{{if $nav.notifications}}
<li id="nav-notify-linkmenu" class="nav-menu fakelink">
- <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><span class="notify">{{$nav.notifications.1}}</span></a>
+ <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
<span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span>
<ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify">
<li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>

0 comments on commit 863dcda

Please sign in to comment.