diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-09-08 20:12:17 +0200 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-09-08 20:12:17 +0200 |
| commit | 2fabf8d2188516a36589487bfa2ca01dea0c5ca2 (patch) | |
| tree | 763475aeb95934ec54b3ba2af8d4604dba086ad1 | |
| parent | 2f5a34ad1791f01cacb3b86c11501f0e11c67df4 (diff) | |
| parent | dbc5ecfe572b0dc11bab277dcbe24541cdd4e858 (diff) | |
| download | volse-hubzilla-2fabf8d2188516a36589487bfa2ca01dea0c5ca2.tar.gz volse-hubzilla-2fabf8d2188516a36589487bfa2ca01dea0c5ca2.tar.bz2 volse-hubzilla-2fabf8d2188516a36589487bfa2ca01dea0c5ca2.zip | |
Merge branch 'newui' of github.com:fabrixxm/friendika into newui
| -rw-r--r-- | js/main.js | 4 | ||||
| -rw-r--r-- | view/theme/quattro/colors.less | 1 | ||||
| -rw-r--r-- | view/theme/quattro/quattro.less | 3 | ||||
| -rw-r--r-- | view/theme/quattro/style.css | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/js/main.js b/js/main.js index 328b1f231..452cb8451 100644 --- a/js/main.js +++ b/js/main.js @@ -97,9 +97,10 @@ var eNotif = $(data).find('notif') notif = eNotif.attr('count'); if (notif>0){ + $("#nav-notifications-linkmenu").addClass("on"); nnm = $("#nav-notifications-menu"); nnm.html(""); - nnm.attr('popup','true'); + //nnm.attr('popup','true'); eNotif.children("note").each(function(){ e = $(this); text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>"); @@ -107,6 +108,7 @@ nnm.append(html); }); } else { + $("#nav-notifications-linkmenu").removeClass("on"); $("#nav-notifications-menu").html(notifications_empty); } if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') } diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index 3d3074d60..b5a203b94 100644 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -58,6 +58,7 @@ @AsideConnect: @Grey1; @AsideConnectBg: @Blue3; @AsideConnectHoverBg: @Blue1; +@VCardLabelColor: @Grey3; @InfoColor: @Grey1; @InfoBackgroundColor: @Metalic3; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 01d0b94b9..54bd11806 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -149,6 +149,7 @@ nav { .menu-popup{ right: 0px; left: auto; } } + #nav-notifications-linkmenu.on .icon.s22.notify, #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png") } #nav-apps-link.selected { background-color: @NavbarSelectedBg; } } @@ -201,7 +202,7 @@ aside { .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; } .title { margin-bottom: 5px; } dl { height: auto; overflow: auto; } - dt {float: left; margin-left: 0px; width: 35%; } + dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; } dd {float: left; margin-left: 4px; width: 60%;} } diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 6daef77a3..70e0a3b94 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -243,7 +243,7 @@ nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; } -nav #nav-notifications-linkmenu.selected .icon.s22.notify { +nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png"); } nav #nav-apps-link.selected { @@ -331,6 +331,8 @@ aside .vcard dt { float: left; margin-left: 0px; width: 35%; + text-align: right; + color: #999999; } aside .vcard dd { float: left; |