From f1836580db88692d86e70e9021cd9b2e298c2fa8 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Mon, 16 Feb 2015 04:56:35 +0100
Subject: [PATCH 1/2] Bootstrap stream: add spinner and improve comment box

---
 app/assets/stylesheets/comments.css.scss      | 10 ++++++++--
 app/assets/stylesheets/new-templates.css.scss |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/comments.css.scss b/app/assets/stylesheets/comments.css.scss
index d9d13eb98..fd9ffba09 100644
--- a/app/assets/stylesheets/comments.css.scss
+++ b/app/assets/stylesheets/comments.css.scss
@@ -36,7 +36,13 @@
     }
     padding-left: 12px;
     width: 95%;
+    display: none;
+  }
+  .comment_box {
+    width: 95%;
+    height: 30px;
+  }
+  .comment_box:focus, .comment_box:valid {
+    & + .submit_button { display: block; }
   }
-  .comment_box { width: 95%; }
-  .comment_box:focus, .comment_box:valid { min-height: 100px; }
 }
diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss
index dd13360bb..eff3651ee 100644
--- a/app/assets/stylesheets/new-templates.css.scss
+++ b/app/assets/stylesheets/new-templates.css.scss
@@ -14,6 +14,7 @@
 @import 'new_styles/base';
 @import 'new_styles/buttons';
 @import 'new_styles/interactions';
+@import 'new_styles/spinner';
 
 /* font overrides */
 @import 'new_styles/typography';
@@ -79,4 +80,4 @@
 @import 'new_styles/code';
 
 /* statistics */
-@import 'new_styles/statistics'
\ No newline at end of file
+@import 'new_styles/statistics'

From 4da6b075ad3700656060a79cd336a0d7e0f7785b Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Mon, 16 Feb 2015 06:23:34 +0100
Subject: [PATCH 2/2] Bootstrap stream: fix interaction buttons

---
 app/assets/stylesheets/new_styles/_interactions.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/new_styles/_interactions.scss b/app/assets/stylesheets/new_styles/_interactions.scss
index 706610ab1..4a389ff33 100644
--- a/app/assets/stylesheets/new_styles/_interactions.scss
+++ b/app/assets/stylesheets/new_styles/_interactions.scss
@@ -2,13 +2,20 @@
   .controls {
     z-index: 6;
     float: right;
-    .comment_report {
+    .post_report, .comment_report {
       display: inline-block;
       .icons-report {
         height: 14px;
         width: 14px;
       }
     }
+    .block_user {
+      display: inline-block;
+      .icons-ignoreuser {
+        height: 14px;
+        width: 14px;
+      }
+    }
     .delete {
       display: inline-block;
       .icons-deletelabel {