From c0de43ecc0c320922bc9870ff1acd143487d0f82 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 17 May 2016 10:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9KE=E5=AD=97=E4=BD=93=E9=97=B4?=
 =?UTF-8?q?=E8=B7=9D=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BB=A3=E7=A0=81=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E5=87=BA=E9=94=99=E6=8F=90=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_intro_content.html.erb        |  2 +-
 .../kindeditor/plugins/code/previewcode.css    |  5 +++--
 public/javascripts/homework.js                 |  2 +-
 public/stylesheets/courses.css                 | 14 +++++++-------
 public/stylesheets/css.css                     |  4 ++--
 public/stylesheets/new_user.css                | 18 +++++++++---------
 public/stylesheets/project.css                 | 18 +++++++++---------
 public/stylesheets/public.css                  |  8 ++++----
 8 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb
index c18e520ba..351f1fdb0 100644
--- a/app/views/users/_intro_content.html.erb
+++ b/app/views/users/_intro_content.html.erb
@@ -1,4 +1,4 @@
-<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth lh18" id="activity_description_<%= user_activity_id%>">
+<div class="homepagePostIntro break_word upload_img  maxh360 table_maxWidth " id="activity_description_<%= user_activity_id%>">
   <div id="intro_content_<%= user_activity_id%>">
     <%= content.to_s.html_safe%>
   </div>
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index b9c8252e8..15951ce98 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -51,5 +51,6 @@ span.at {color:#269ac9;}
 span.at a{color:#269ac9;text-decoration: none;}
 
 /*yk*/
-.ke-content ol li{list-style-type: decimal;margin-left: 20px;}
-.ke-content ul li{list-style-type: disc;margin-left: 20px;}
\ No newline at end of file
+.ke-content ol li{list-style-type: decimal;}
+.ke-content ul li{list-style-type: disc;}
+ol,ul{margin-top:0;}
\ No newline at end of file
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index aaf70cd3f..b1144ebf1 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -71,7 +71,7 @@ $(function(){
                         //弹框
                         var root_path = getRootPath();
                         var forums_1_path = root_path + "/forums/1"
-                        var htmlvalue = "</br><div style='width:400px;text-align:center;margin:0 auto' >您的程序引发了不知名异常，请在公共贴吧提交您的代码进行意见反馈，我们处理后会立即联系您，谢谢！</div><div style='width:550px;text-align:center'><a  target='_Blank' href="+forums_1_path+">点我进入反馈页面</a></div>";
+                        var htmlvalue = "</br><div style='width:430px;text-align:center;margin:0 auto' >您的程序引发了不知名异常，请在公共贴吧提交您的代码进行意见反馈，我们处理后会立即联系您，谢谢！</div><div style='width:550px;text-align:center'><a  target='_Blank' href="+forums_1_path+">点我进入反馈页面</a></div>";
                         pop_up_box(htmlvalue,580,30,50);
 
                         $('#test-program-btn').show();
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 6e55146a6..036bdeb8d 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -129,8 +129,8 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
 .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
-.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
@@ -426,8 +426,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 span.author { font-size: 0.9em; color: #888; }
 
 /* 创建作品 work */
@@ -1114,10 +1114,10 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;}
-.postDetailDes ul li{list-style-type: disc;margin-left: 20px;}
+.postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
+.postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; }
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index b740436f9..3e21a5fda 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -120,8 +120,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop span{ float:left;}
 .ping_distop p{ color:#5f5f5f;min-height: 24px;}
 .ping_disfoot a{ float:right; color:#15bccf; margin-left:5px;}
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 .ping_distop span a{ float:right; /*width:20px;*/ height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}
 
 
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 67176c761..3b2857854 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -676,8 +676,8 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
-.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
 .borderBottomNone {border-bottom:none !important;}
@@ -713,8 +713,8 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyDes {float:left; width:642px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family:"微软雅黑","宋体";}
-.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
@@ -857,10 +857,10 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailTitle {width:570px; max-width:570px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;}
-.postDetailDes ul li{list-style-type: disc;margin-left: 20px;}
+.postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
+.postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; } /*line-height: 18px !important;*/
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { color:#888888; float:right;display: inline}
@@ -1351,8 +1351,8 @@ a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-l
 a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 .ul_grey li {color:#909090; list-style-position:inside; padding-left:1px;list-style-image:url('../images/news_dot2.png')}
 .ul_normal_color li {list-style-position:inside; padding-left:1px; list-style-image:url('../images/news_dot.png')}
 span.author { font-size: 0.9em; color: #888; }
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 1ef99e66b..c7ec7e1ab 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -220,8 +220,8 @@ a:hover.talk_btn{ background:#2a9dc1;}
 .mt0{ margin-top:0px;}
 .talk_info{  margin-left:60px; margin-top:10px;}
 /*.issue_desc li{list-style-type: decimal;margin-left: 20px;}*/
-.issue_desc ol li{list-style-type: decimal;margin-left: 20px;}
-.issue_desc ul li{list-style-type: disc;margin-left: 20px;}
+.issue_desc ol li{list-style-type: decimal;margin-left: 40px;}
+.issue_desc ul li{list-style-type: disc;margin-left: 40px;}
 .talk_info img {max-width:100%;}
 a.talk_edit{ color:#426e9a; margin-right:5px;}
 a:hover.talk_edit{ color:#ff5722;}
@@ -333,8 +333,8 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 
 /*上传资源弹出框样式*/
 .popbox_polls{position:fixed !important;}
@@ -971,8 +971,8 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
     margin: 10px auto 0px;
     background-color: #F1F1F1;
 }
-.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .topBorder {
     border-top: 1px solid #E4E4E4;
@@ -1111,10 +1111,10 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;}
-.postDetailDes ul li{list-style-type: disc;margin-left: 20px;}
+.postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
+.postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 253aaf46b..0d19724e7 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -599,8 +599,8 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
 .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
-.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
@@ -635,8 +635,8 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyDes {float:left; width:620px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
-.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}