Merge branch 'v0.21-dev'

humhub · Nov 25, 2015 · 6919e58 · 6919e58
2 parents 768e6fb + dc773fc
commit 6919e58
Show file tree

Hide file tree

Showing 363 changed files with 10,786 additions and 3,407 deletions.
diff --git a/css/flatelements.css b/css/flatelements.css
@@ -117,6 +117,7 @@
     display: inline-block;
     position: relative;
     float: left;
+    margin-right: 5px;
 }
 
 .regular-checkbox:checked + .regular-checkbox-box {
@@ -182,3 +183,11 @@
     border: 2px solid #ccc;
     margin-right: 5px;
 }
+
+.chk_rdo .form-group {
+    margin-bottom: 0px;
+}
+
+.chk_rdo .form-group label {
+    margin-bottom: 0px;
+}
diff --git a/img/emoji/Ambivalent.png b/img/emoji/Ambivalent.png
diff --git a/img/emoji/Ambivalent.svg b/img/emoji/Ambivalent.svg
diff --git a/img/emoji/Angry.png b/img/emoji/Angry.png
diff --git a/img/emoji/Angry.svg b/img/emoji/Angry.svg
diff --git a/img/emoji/Astonished.svg b/img/emoji/Astonished.svg
diff --git a/img/emoji/Beer.svg b/img/emoji/Beer.svg
diff --git a/img/emoji/Beers.svg b/img/emoji/Beers.svg
diff --git a/img/emoji/Burger.svg b/img/emoji/Burger.svg