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

2016-07-15 13:21:07 +02:00
parent c2779b6f33 da5ec98f98
commit 34a16e0ab9
5 changed files with 2192 additions and 2122 deletions
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2036,3 +2036,14 @@ dl.bb-dl > dd > li {
    border-style: solid;
    border-width: 5px;
 }
+
+.atoken-list {
+	margin-right: 5px;
+	list-style-type: none;
+}
+.atoken-list li {
+	margin-bottom: 10px;
+}
+.atoken-text {
+	margin: 5px 10px 5px 10px;
+}