Merge branch 'master' into plip10359-z3cform

Conflicts: CHANGES.rst
2015-01-29 21:31:45 +01:00
parent c45650261e 4f1491bea8
commit 5f1a7fb5bc
105 changed files with 4849 additions and 3559 deletions
@@ -224,3 +224,9 @@
 .row .discussion label {
    font-weight:bold;
 }
+
+/* editing comments */
+
+.overlay-edit-comment textarea {
+    height: 10em;
+}