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

2017-03-30 16:10:59 -07:00
parent b51ca4c8d3 dea4879938
commit a9cceea850
21 changed files with 3282 additions and 431 deletions
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -67,10 +67,6 @@ code {
 	white-space: normal;
 }

-.panel-group {
-	margin-bottom: 0px;
-}
-
 /* Bootstrap assumes that checkboxes are on the left of labels, while it's usually the opposite in Red */
 .field.checkbox input[type="checkbox"] { margin-left: 0px; }
 .field.checkbox label { padding-left: 0px; font-weight: 700}
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -7,6 +7,11 @@
 	margin-top: 0px;
 }

+.widget .active .wall-item-ago,
+.widget .active .dropdown-sub-text {
+	color: #fff;
+}
+
 .tags {
 	word-wrap: break-word;
 }