Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

This commit is contained in:
zotlabs
2017-03-27 14:11:25 -07:00
467 changed files with 9414 additions and 621 deletions

View File

@@ -737,10 +737,6 @@ div.jGrowl div.jGrowl-notification {
color: $font_colour;
}
.active .conv-participants {
color: #fff;
}
.contactname {
font-weight: bold;
display: block;
@@ -1097,9 +1093,10 @@ a:hover .dropdown-sub-text {
}
.active .wall-item-ago,
a:active .wall-item-ago,
a.active:hover .wall-item-ago,
.active .dropdown-sub-text,
a:active .dropdown-sub-text {
a:active .dropdown-sub-text,
a.active:hover .dropdown-sub-text {
color: #fff;
}