Merge branch 'master' into john-graph

# Conflicts: # Gemfile
2016-05-12 16:02:38 +02:00
parent fa0d893c21 c69ab69c46
commit 6bb5b53bad
36 changed files with 322 additions and 316 deletions
--- a/app/assets/stylesheets/editor.css.scss
+++ b/app/assets/stylesheets/editor.css.scss
@@ -88,3 +88,10 @@ button i.fa-spin {
  color: #777;
  font-size: 0.8em;
 }
+
+.requestCommentsButton {
+  position: relative;
+  margin-top: -50px;
+  margin-right: 25px;
+  float: right;
+}