diff --git a/app/views/homework_common/_homework_common_form.html.erb b/app/views/homework_common/_homework_common_form.html.erb
index e3ef0d237..28aa490de 100644
--- a/app/views/homework_common/_homework_common_form.html.erb
+++ b/app/views/homework_common/_homework_common_form.html.erb
@@ -11,12 +11,14 @@
   <li >
     <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
     <!--<textarea  name="" placeholder="请在此填入作业的要求及评分依据"  class=" w548 h150 mb10 fl"  ></textarea>-->
-    <% if edit_mode %>
-        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
-    <% else %>
-        <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor' %>
-    <% end %>
+    <div style="width: 83%;float: left;">
+      <% if edit_mode %>
+          <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
+      <% else %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+          <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
+      <% end %>
+    </div>
   </li>
   <div class="cl"></div>
   <li class="mt10">
diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb
index 32c8e368e..1769c98f3 100644
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@@ -8,11 +8,15 @@
     <% if is_new %>
       <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
       <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
-      <%= f.kindeditor :description,:width=>'91%',:editor_id=>'news_description_editor' %>
+      <div class="fl" style="width: 91%">
+        <%= f.kindeditor :description,:editor_id=>'news_description_editor' %>
+      </div>
       <p id="description_notice_span" class="ml55"></p>
     <% else %>
       <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
-      <%= f.kindeditor :description,:width=>'91%',:editor_id=>'news_description_editor',:owner_id => @news.id,:owner_type => OwnerTypeHelper::NEWS %>
+      <div class="fl" style="width: 91%">
+        <%= f.kindeditor :description,:editor_id=>'news_description_editor',:owner_id => @news.id,:owner_type => OwnerTypeHelper::NEWS %>
+      </div>
       <p id="description_notice_span" class="ml55"></p>
     <% end %>
 
diff --git a/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css b/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css
index 428b6c8b5..0d322283a 100644
--- a/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css
+++ b/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css
@@ -421,6 +421,7 @@
 	overflow: hidden;
 	margin: 0;
 	padding: 0;
+    max-width: 100%;
 }
 /* toolbar */
 .ke-toolbar {
diff --git a/public/assets/kindeditor/themes/default/default.css b/public/assets/kindeditor/themes/default/default.css
index 5de213f37..c5a84c186 100644
--- a/public/assets/kindeditor/themes/default/default.css
+++ b/public/assets/kindeditor/themes/default/default.css
@@ -432,6 +432,7 @@
 }
 /* container */
 .ke-container {
+    max-width: 100%;
 	display: block;
 	border: 1px solid #CCCCCC;
 	background-color: #FFF;
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 4bfc1ef99..0ed497127 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -440,3 +440,4 @@ img{max-width: 100%;}
 .attachments {clear: both;}
 .is_public_checkbox{margin-left: 15px;margin-right: 10px;}
 .author_name{color: #3ca5c6 !important;}
+.ke-container-default{max-width: 100%;}