From 2a31c2a6dbd4194c0390090d8b52b4e775b1ed5b Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Sat, 1 Oct 2016 00:39:41 +0200
Subject: [PATCH 1/2] Unify new conversation margins

---
 app/assets/stylesheets/conversations.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss
index 2cb78e2da..efb89b669 100644
--- 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; }

From 471af747b1dcd016e0cc7bb8e665741782bf8a08 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Sat, 1 Oct 2016 01:05:46 +0200
Subject: [PATCH 2/2] Remove extra padding from comment form in the stream

closes #7133
---
 app/assets/stylesheets/comments.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/stylesheets/comments.scss b/app/assets/stylesheets/comments.scss
index 0ad5cb838..3a9828c8f 100644
--- 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 {