diff --git a/app/views/poll/new.html.erb b/app/views/poll/new.html.erb
index 85a4ab8e3..b182f4a29 100644
--- a/app/views/poll/new.html.erb
+++ b/app/views/poll/new.html.erb
@@ -9,7 +9,7 @@
-
+
-
单选题
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 99e88c98d..fe8af280f 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -1,5 +1,5 @@
/* CSS Document */
-#polls{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+#polls{ font-size:12px; font-family:"微软雅黑","宋体" !important; line-height:1.9; background:#fff; font-style:normal;}
div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
#polls div,img,tr,td{ border:0;}
#polls table,tr,td{border:0; cellspacing:0; cellpadding:0;}
@@ -69,22 +69,22 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
/*问卷编辑*/
.polls_edit{ color:#767676;}
a:hover{ text-decoration:none; cursor:pointer;}
-.tabs{ width:665px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;}
+.tabs_1{ width:665px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;}
.tab_item { float:left; height:30px; background:#eeeeee; margin-right:4px; padding:0 8px; margin-bottom:10px;}
.icon_delete{ font-size:16px;}
a:hover.icon_delete{ font-weight: bold;}
.current{ color:#4f4f4d; background:#c4c4c4;}
.tab_add{float:left; width:22px; height:22px; border:1px solid #cbcbcb; margin-top:6px; }
-.icon_page_add{ background:url(../images/icons.png) 4px -314px no-repeat; width:22px; height:27px; display:block;}
-a:hover.icon_page_add{ background:url(../images/icons.png) -16px -314px no-repeat;}
+.icon_page_add{ background:url(images/icons.png) 4px -314px no-repeat; width:22px; height:27px; display:block;}
+a:hover.icon_page_add{ background:url(images/icons.png) -16px -314px no-repeat;}
.tab_item02{ float:left; width:141px; height:30px;background:#eeeeee; margin-right:10px; padding:0 10px; margin-bottom:10px; padding:10px 0 0 15px;}
.tab_item02:hover{ background:#c9c9c9;}
.tab_icon{padding-left:25px;}
a:hover.tab_item02{ background:#fff;}
-.icon_radio{background:url(../images/icons.png) 0px 0px no-repeat; }
-.icon_checkbox{background:url(../images/icons.png) 0px -40px no-repeat; }
-.icon_text{background:url(../images/icons.png) 0px -80px no-repeat; }
-.icon_textarea{background:url(../images/icons.png) 0px -120px no-repeat; }
+.icon_radio{background:url(images/icons.png) 0px 0px no-repeat;color: gray; padding-bottom: 5px;}
+.icon_checkbox{background:url(images/icons.png) 0px -40px no-repeat;color: gray; padding-bottom: 5px;}
+.icon_text{background:url(images/icons.png) 0px -80px no-repeat;color: gray; padding-bottom: 5px;}
+.icon_textarea{background:url(images/icons.png) 0px -120px no-repeat; color: gray;padding-bottom: 5px;}
.ur_editor {width:655px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
.ur_title_editor_title{ margin-bottom:10px;}
@@ -98,18 +98,18 @@ a:hover.btn_cancel{ color:#666;}
.ur_editor_title{ margin-bottom:10px;}
.ur_editor_content{ }
.ur_item{ margin-bottom:5px; height:32px; }
-.ur_item input{ width:324px; height:30px;border:1px solid #cbcbcb; padding-left:5px; float:left; margin-right:10px; }
+.ur_item input{ width:324px; height:30px;border:1px solid #cbcbcb; padding:0 5px; float:left; margin-right:10px; }
.ur_item label{ float:left;}
-.icon_add{ background:url(../images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
-a:hover.icon_add{background:url(../images/icons.png) -20px -310px no-repeat;}
-.icon_remove{background:url(../images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;}
-a:hover.icon_remove{background:url(../images/icons.png) -20px -338px no-repeat;}
+.icon_add{ background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
+a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
+.icon_remove{background:url(images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;}
+a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
.ur_editor_toolbar{ margin-bottom:10px;}
.ur_editor_toolbar input{ width:40px; height:20px;}
.ur_editor02{width:655px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;}
a.ur_button_submit{ display:block; width:106px; height:37px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:3px; margin-bottom:10px; }
a:hover.ur_button_submit{ background:#0fa9bb; text-decoration:none;}
-a.ur_icon_de{ background:url(../images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:right; margin-top:15px;}
-a:hover.ur_icon_de{ background:url(../images/icons.png) -20px -338px no-repeat;}
-.ur_icon_edit{ background:url(../images/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right; margin-top:15px; margin-right:10px;}
-a:hover.ur_icon_edit{ background:url(../images/icons.png) -21px -272px no-repeat;}
+a.ur_icon_de{ background:url(images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:right; margin-top:15px;}
+a:hover.ur_icon_de{ background:url(images/icons.png) -20px -338px no-repeat;}
+.ur_icon_edit{ background:url(images/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right; margin-top:15px; margin-right:10px;}
+a:hover.ur_icon_edit{ background:url(images/icons.png) -21px -272px no-repeat;}
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index e10c5a91b..897434393 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"]