Merge branch 'next-minor' into develop

2016-10-01 02:29:11 +02:00 · 2016-10-01 02:29:11 +02:00 · fc3627d567
commit fc3627d567
parent c41fd52f1d 471af747b1
2 changed files with 5 additions and 0 deletions
--- a/app/assets/stylesheets/comments.scss
+++ b/app/assets/stylesheets/comments.scss
@ -29,6 +29,9 @@
      padding-left: 3px;
    }
  }
+
+  .comment.new-comment-form-wrapper { padding-bottom: 0; }
+
  .submit_button {
    margin-top: 10px;
    input {
--- a/app/assets/stylesheets/conversations.scss
+++ b/app/assets/stylesheets/conversations.scss
@ -188,3 +188,5 @@
  input#contact_ids { box-shadow: none; }
  label { font-weight: bold; }
 }
+
+.new-conversation.form-horizontal .form-group:last-of-type { margin-bottom: 0; }