Merge branch 'newui' of github.com:fabrixxm/friendika into newui
This commit is contained in:
commit
2fabf8d218
|
@ -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') }
|
||||
|
|
|
@ -58,6 +58,7 @@
|
|||
@AsideConnect: @Grey1;
|
||||
@AsideConnectBg: @Blue3;
|
||||
@AsideConnectHoverBg: @Blue1;
|
||||
@VCardLabelColor: @Grey3;
|
||||
|
||||
@InfoColor: @Grey1;
|
||||
@InfoBackgroundColor: @Metalic3;
|
||||
|
|
|
@ -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%;}
|
||||
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue