From 092dd61c86ba79a74454f680ec8ed3953b85f405 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 17 Jan 2015 11:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E5=A4=84=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/show.html.erb                              | 2 +-
 public/stylesheets/polls.css                              | 6 +++---
 public/themes/redpenny-master/stylesheets/application.css | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index bc5136718..d20f46297 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -180,7 +180,7 @@
 
                       }
                   </script>
-                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id).html_safe %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
+                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" style="width: 100%" value="<%= get_anwser_vote_text(pq.id,User.current.id).html_safe %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
                 </div>
               </li><!--单行输入 end-->
           <% elsif pq.question_type == 4 %>
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index e89e50be4..b238eedd8 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -94,13 +94,13 @@ a:hover.tab_item02{ background:#fff;}
 
 .ur_editor {width:655px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
 .ur_title_editor_title{ margin-bottom:10px;}
-.input_title{ width:630px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold;}
-.textarea_editor{  width:632px; height:120px; padding:10px; margin-bottom:10px;}
+.input_title{ width:630px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold;border: 1px solid #DCDCDC !important;}
+.textarea_editor{  width:632px; height:120px; padding:10px; margin-bottom:10px;border: 1px solid #DCDCDC !important;}
 .btn_submit{ width:56px; height:24px;  padding-top:4px;background:#15bccf; color:#fff; text-align:center; display:block; float:left; margin-right:10px;}
 a:hover.btn_submit{background:#0fa9bb;}
 .btn_cancel{width:54px; height:22px;  padding-top:4px;background:#fff; color:#999; border:1px solid #999; text-align:center; display:block; float:left; }
 a:hover.btn_cancel{ color:#666;}
-.ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding:0 5px !important; margin-right:10px;}
+.ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding:0 5px !important; margin-right:10px;border: 1px solid #DCDCDC !important;}
 .ur_editor_title{ margin-bottom:10px;}
 .ur_editor_content{ }
 .ur_item{ margin-bottom:5px; height:32px; }
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 897434393..936610c6b 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -851,8 +851,8 @@ p.breadcrumb
 
 input[type="text"],input[type="password"],textarea,select
 {
-  #padding:2px;
-  #border:1px solid #039ea0
+  padding:2px;
+  border:1px solid #039ea0
 }
 
 input[type="text"],input[type="password"]