From 715f451ed4526f4d22f41a37c4c113f7e9dd05d6 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Fri, 10 Oct 2014 20:05:28 +0200
Subject: [PATCH] only collapse empty comment box

---
 app/assets/stylesheets/comments.css.scss        | 2 +-
 app/assets/stylesheets/new_styles/_forms.scss   | 7 ++++++-
 app/assets/templates/comment-stream_tpl.jst.hbs | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/comments.css.scss b/app/assets/stylesheets/comments.css.scss
index 5d4e45361..d9d13eb98 100644
--- a/app/assets/stylesheets/comments.css.scss
+++ b/app/assets/stylesheets/comments.css.scss
@@ -38,5 +38,5 @@
     width: 95%;
   }
   .comment_box { width: 95%; }
-  .comment_box:focus { min-height: 100px; }
+  .comment_box:focus, .comment_box:valid { min-height: 100px; }
 }
diff --git a/app/assets/stylesheets/new_styles/_forms.scss b/app/assets/stylesheets/new_styles/_forms.scss
index a6ecf1569..15aeddeac 100644
--- a/app/assets/stylesheets/new_styles/_forms.scss
+++ b/app/assets/stylesheets/new_styles/_forms.scss
@@ -87,11 +87,16 @@ form.block-form {
 }
 
 textarea, input[type=text], input[type=password], input[type=search] {
-  &:focus, &:invalid:focus {
+  &:focus, 
+  &:invalid,
+  &:invalid:focus,
+  &:invalid:required,
+  &:invalid:required:focus {
     border: 1px solid $border-dark-grey;
     outline: none;
     -webkit-box-shadow: none;
     box-shadow: none;
+    color : $text-dark-grey;
   }
 }
 
diff --git a/app/assets/templates/comment-stream_tpl.jst.hbs b/app/assets/templates/comment-stream_tpl.jst.hbs
index abcc20324..2525f1c5b 100644
--- a/app/assets/templates/comment-stream_tpl.jst.hbs
+++ b/app/assets/templates/comment-stream_tpl.jst.hbs
@@ -20,7 +20,7 @@
 
     <div class="bd">
       <form accept-charset="UTF-8" action="/posts/{{id}}/comments" class="new_comment" id="new_comment_on_{{id}}" method="post">
-        <textarea class="comment_box" id="comment_text_on_{{id}}" name="text" rows="2" placeholder="{{t "stream.comment"}}" />
+        <textarea class="comment_box" id="comment_text_on_{{id}}" name="text" rows="2" required placeholder="{{t "stream.comment"}}" />
         <div class="submit_button">
           <input class="button creation" id="comment_submit_{{id}}" name="commit" type="submit" value="{{t "stream.comment"}}" />
         </div>