bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge branch 'newui' of github.com:fabrixxm/friendika into newui

Browse source
This commit is contained in:
fabrixxm 2011-09-08 20:12:17 +02:00
commit 2fabf8d218
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/main.js
View file

@ -97,9 +97,10 @@
var eNotif = $(data).find('notif') var eNotif = $(data).find('notif')
notif = eNotif.attr('count'); notif = eNotif.attr('count');
if (notif>0){ if (notif>0){
$("#nav-notifications-linkmenu").addClass("on");
nnm = $("#nav-notifications-menu"); nnm = $("#nav-notifications-menu");
nnm.html(""); nnm.html("");
nnm.attr('popup','true'); //nnm.attr('popup','true');
eNotif.children("note").each(function(){ eNotif.children("note").each(function(){
e = $(this); e = $(this);
text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>"); text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
@ -107,6 +108,7 @@
nnm.append(html); nnm.append(html);
}); });
} else { } else {
$("#nav-notifications-linkmenu").removeClass("on");
$("#nav-notifications-menu").html(notifications_empty); $("#nav-notifications-menu").html(notifications_empty);
} }
if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') } if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }

1
view/theme/quattro/colors.less
View file

@ -58,6 +58,7 @@
@AsideConnect: @Grey1; @AsideConnect: @Grey1;
@AsideConnectBg: @Blue3; @AsideConnectBg: @Blue3;
@AsideConnectHoverBg: @Blue1; @AsideConnectHoverBg: @Blue1;
@VCardLabelColor: @Grey3;
@InfoColor: @Grey1; @InfoColor: @Grey1;
@InfoBackgroundColor: @Metalic3; @InfoBackgroundColor: @Metalic3;

3
view/theme/quattro/quattro.less
View file

@ -149,6 +149,7 @@ nav {
.menu-popup{ right: 0px; left: auto; } .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-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png") }
#nav-apps-link.selected { background-color: @NavbarSelectedBg; } #nav-apps-link.selected { background-color: @NavbarSelectedBg; }
} }
@ -201,7 +202,7 @@ aside {
.fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; } .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
.title { margin-bottom: 5px; } .title { margin-bottom: 5px; }
dl { height: auto; overflow: auto; } 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%;} dd {float: left; margin-left: 4px; width: 60%;}
} }

4
view/theme/quattro/style.css
View file

@ -243,7 +243,7 @@ nav #nav-site-linkmenu .menu-popup {
right: 0px; right: 0px;
left: auto; 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"); background-image: url("../../../images/icons/22/notify_on.png");
} }
nav #nav-apps-link.selected { nav #nav-apps-link.selected {
@ -331,6 +331,8 @@ aside .vcard dt {
float: left; float: left;
margin-left: 0px; margin-left: 0px;
width: 35%; width: 35%;
text-align: right;
color: #999999;
} }
aside .vcard dd { aside .vcard dd {
float: left; float: left;