From 5b5423b8c5e9ad237e0308380283fa309439e0a8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Apr 2015 10:47:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=B4=E5=90=A7=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E5=B8=96=E5=AD=90=E3=80=81=E5=9B=9E=E5=A4=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=A0=B7=E5=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_searchmembers.html.erb | 2 +-
 app/views/forums/show.html.erb            | 1 +
 app/views/memos/_reply_box.html.erb       | 1 +
 public/stylesheets/nyan.css               | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/_searchmembers.html.erb b/app/views/courses/_searchmembers.html.erb
index c6b577c8d..1956f34c4 100644
--- a/app/views/courses/_searchmembers.html.erb
+++ b/app/views/courses/_searchmembers.html.erb
@@ -1,5 +1,5 @@
 <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:remote=>true,:id => "search_student") do %>
-    <%= text_field_tag 'name', params[:name], name: "name", :class => 'st_search_input', :placeholder => '输入学生姓名、学号进行搜索'%>
+    <%= text_field_tag 'name', params[:name], name: "name", :class => 'st_search_input', :placeholder => '输入学生昵称、姓名、学号进行搜索'%>
     <% if @group %>
         <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %>
         <input type="hidden" name="ingroup">
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 2f4ec56a0..8e50837ff 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -22,6 +22,7 @@
           <br />
 		  <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
 		</p>
+        <div class="cl"></div>
 		<%= f.submit :value => l(:label_memo_create) %>
 		<%= link_to l(:button_cancel), "#", :onclick => '$("#add-memo").hide(); return false;' %>
 	</div>
diff --git a/app/views/memos/_reply_box.html.erb b/app/views/memos/_reply_box.html.erb
index 1ee94dd3e..27038255e 100644
--- a/app/views/memos/_reply_box.html.erb
+++ b/app/views/memos/_reply_box.html.erb
@@ -14,5 +14,6 @@
           <br />
 		  <%= render :partial => 'attachments/form' %>
 		</p>
+    <div class="cl"></div>
 	<%= f.submit value: l(:label_reply_plural), class: "replies" %>
 <% end %> 
\ No newline at end of file
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index de4dcb65c..a6dfe3f90 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -734,7 +734,7 @@ div.actions input[type="text"] {
 .replies {
     overflow: hidden;
     max-width: 100%;
-    float: right;
+    float: left;
     /*max-width: 90%;*/
 }