Merge pull request #5672 from svbergerem/bootstrap-stream-improvements

Bootstrap stream: add spinner and improve comment box

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; }
 }

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'

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 {