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

This commit is contained in:
zotlabs
2017-07-13 19:59:30 -07:00
5 changed files with 449 additions and 440 deletions
+3 -3
View File
@@ -77,7 +77,7 @@
/* conv_item */
.wall-item-head-new {
border-top: 0.2rem solid #0275d8;
border-top: 0.2rem solid #007bff;
}
.wall-item-info {
@@ -168,11 +168,11 @@ a.wall-item-name-link {
}
.ivoted {
color: #0275d8;
color: #007bff;
}
.item-highlight {
border-left: 0.2rem solid #0275d8;
border-left: 0.2rem solid #007bff;
}
.item-highlight .wall-item-head,
+1 -1
View File
@@ -80,7 +80,7 @@ if (! $nav_icon_colour)
if (! $nav_active_icon_colour)
$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
if (! $link_colour)
$link_colour = '#0275d8';
$link_colour = '#007bff';
if (! $banner_colour)
$banner_colour = '#fff';
if (! $bgcolour)