From 90df8056c8a4a40fbc8b75bc3b868209e1a740a6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 19 Mar 2015 14:58:42 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?=
=?UTF-8?q?=E6=8E=A7=E4=BB=B6=E4=B8=AD=E7=9C=81=E7=95=A5=E5=8F=B7=E9=A2=9C?=
=?UTF-8?q?=E8=89=B2=202=E3=80=81=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=203=E3=80=81=E4=BF=AE=E6=94=B9=E8=AF=BE?=
=?UTF-8?q?=E7=A8=8B=E9=A6=96=E9=A1=B5=E7=94=A8=E6=96=B0=E5=BB=BA=E9=97=AE?=
=?UTF-8?q?=E5=8D=B7=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/base_courses.html.erb | 4 +-
lib/redmine/pagination.rb | 4 +-
public/stylesheets/courses.css | 70 ++++++++++++-------------
public/stylesheets/leftside.css | 14 ++---
public/stylesheets/public.css | 21 ++++++--
5 files changed, 60 insertions(+), 53 deletions(-)
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 5dd5f4444..ea0e48b20 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -143,9 +143,7 @@
<%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange" %>
- <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%>
- <%= link_to "(#{course_poll_count})", poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => "subnav_num c_orange" %>
- <%= link_to( "+#{l(:label_new_poll)}", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'subnav_green c_white') if is_teacher %>
+ <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%><%= link_to "(#{course_poll_count})", poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => "subnav_num c_orange" %><%= link_to( "+#{l(:label_new_poll)}", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'subnav_green c_white') if is_teacher %>
diff --git a/lib/redmine/pagination.rb b/lib/redmine/pagination.rb
index 3c891b520..00a20c15e 100644
--- a/lib/redmine/pagination.rb
+++ b/lib/redmine/pagination.rb
@@ -253,9 +253,9 @@ module Redmine
paginator.linked_pages.each do |page|
if previous && previous != page - 1
if flag
- html << '' << content_tag('a', '...') << '' + ' '
+ html << '' << content_tag('a', '...', :class => 'c_blue') << '' + ' '
else
- html << '' << content_tag('span', '...', :class => 'spacer') << '' + ' '
+ html << '' << content_tag('span', '...', :class => 'spacer ') << '' + ' '
end
end
if page == paginator.page
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 15172c6c2..80bee2cf0 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -13,16 +13,16 @@
.img_talk{ background:url(../images/new_project/img_project.png) 0 -62px no-repeat;}
.img_ziyuan{ background:url(../images/new_project/img_project.png) 0 -115px no-repeat;}
.img_edition{ background:url(../images/new_project/img_project.png) 0 -167px no-repeat;}
-a.project_name{ color:#058c42;}
-a:hover.project_name{ color:#016f33;}
+.project_name{ color:#058c42;}
+.project_name:hover{ color:#016f33;}
.project_txt{ color:#0781b4; width:445px; display:block; float:left; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-a.project_txt02{ color:#0781b4; width:618px; display:block; float:left; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-a:hover.project_txt{ color:#066e9a;}
+.project_txt02{ color:#0781b4; width:618px; display:block; float:left; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.project_txt:hover{ color:#066e9a;}
.noline{ border-bottom:none;}
.news_description{max-height: 38px;overflow:hidden;}
.news_description_none{max-height: none;}
-a.news_foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:600px; height:20px; padding-top:3px; cursor:pointer;}
-a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
+.news_foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:600px; height:20px; padding-top:3px; cursor:pointer;}
+.news_foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}
/*弹框*/
.floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;}
@@ -37,29 +37,29 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
/*.icon_addm:hover{background:url(../images/img_floatbox.png) 0 -61px no-repeat; }*/
/*.icon_removem{ background:url(../images/img_floatbox.png) -22px -33px no-repeat;width:16px; height:16px; display:block; margin:5px 0 0 5px}*/
/*.icon_removem:hover{background:url(../images/img_floatbox.png) -22px -61px no-repeat;}*/
-a.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;}
-a:hover.btn_free{ background:#d63502;}
+.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;}
+.btn_free:hover{ background:#d63502;}
/*成员邀请*/
.invi_search{ width:230px; margin:0 auto;}
.invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
-a.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;}
-a:hover.invi_search_btn{ background:#0da1b2; border:1px solid #0da1b2;}
+.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;}
+.invi_search_btn:hover{ background:#0da1b2; border:1px solid #0da1b2;}
/*问题跟踪*/
.problem_top{ margin:10px 0 ;}
.problem_search_input{ border:1px solid #64bdd9; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
-a.problem_search_btn{ background:#64bdd9; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #64bdd9; padding-top:2px; cursor:pointer;}
-a:hover.problem_search_btn{ background:#3da1c1; border:1px solid #3da1c1;}
-a.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143; padding:1px 3px; font-size:12px; text-align:center; padding-top:2px;}
-a:hover.problem_new_btn{ background:#ff7143; color:#fff;}
+.problem_search_btn{ background:#64bdd9; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #64bdd9; padding-top:2px; cursor:pointer;}
+.problem_search_btn:hover{ background:#3da1c1; border:1px solid #3da1c1;}
+.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143; padding:1px 3px; font-size:12px; text-align:center; padding-top:2px;}
+.problem_new_btn:hover{ background:#ff7143; color:#fff;}
.problem_p{ color:#535252; margin-top:5px;}
.problem_p span{ color:#ff3e00;}
-a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
-a:hover.problem_pic{border:1px solid #64bdd9;}
+.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
+.problem_pic:hover{border:1px solid #64bdd9;}
.problem_txt{ width:610px; margin-left:10px; color:#777777;}
-a.problem_name{ color:#ff5722;}
-a:hover.problem_name{ color:#d33503;}
-a.problem_tit{ color:#0781b4; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-a:hover.problem_tit{ color:#09658c; }
+.problem_name{ color:#ff5722;}
+.problem_name:hover{ color:#d33503;}
+.problem_tit{ color:#0781b4; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.problem_tit:hover{ color:#09658c; }
.problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
/****翻页***/
ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
@@ -73,13 +73,13 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
.talk_txt{ width:460px; margin-left:10px; color:#676868;}
.talk_up{ color:#f63c00;}
.talk_pic{width:32px; height:32px; padding:2px;}
-a.talk_btn{ background:#64bdd9; width:50px; height:20px; color:#fff; text-align:center; margin-top:12px; padding-top:3px;}
-a:hover.talk_btn{ background:#2a9dc1;}
+.talk_btn{ background:#64bdd9; width:50px; height:20px; color:#fff; text-align:center; margin-top:12px; padding-top:3px;}
+.talk_btn:hover{ background:#2a9dc1;}
/****讨论区内页***/
.mt0{ margin-top:0px;}
.talk_info{ color:#7d7d7d; margin-left:50px; margin-top:10px;}
-a.talk_edit{ color:#426e9a; margin-right:5px;}
-a:hover.talk_edit{ color:#ff5722;}
+.talk_edit{ color:#426e9a; margin-right:5px;}
+.talk_edit:hover{ color:#ff5722;}
.talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;}
.talkpage_text{ border:1px solid #64bdd9; width:600px; color:#7d7d7d; padding:5px; margin:10px 0 10px 50px; background:#fff;}
/****新建讨论***/
@@ -88,10 +88,10 @@ a:hover.talk_edit{ color:#ff5722;}
.talk_text{ border:1px solid #64bdd9; height:100px;width:585px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
.talk_new ul li{ }
.sb{width:70px; height:26px; color:#606060; cursor:pointer;}
-a.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; height:26px; width:50px; text-align:center; margin-left:10px; margin-top:10px; padding-top:3px;}
-a:hover.blue_btn{ background:#329cbd;}
-a.grey_btn{ background:#d9d9d9; color:#656565;}
-a:hover.grey_btn{ background:#717171; color:#fff;}
+.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; height:26px; width:50px; text-align:center; margin-left:10px; margin-top:10px; padding-top:3px;}
+.blue_btn:hover{ background:#329cbd;}
+.grey_btn{ background:#d9d9d9; color:#656565;}
+.grey_btn:hover{ background:#717171; color:#fff;}
/****资源库***/
.f_l{ float:left;}
.f_r{ float:right;}
@@ -112,17 +112,17 @@ a:hover.grey_btn{ background:#717171; color:#fff;}
.re_search{ margin-top:7px; margin-left:5px;}
.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
.re_schbtn{ width:60px; height:26px; color:#fff; margin-right:5px; border:none; margin-left:0px; }
-a.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; }
-a:hover.re_fabu{background:#55a1b9;}
+.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; }
+.re_fabu:hover{background:#55a1b9;}
.re_con{ margin:5px; width:665px;}
.re_con_top{color:#494949; }
.re_con_top span{ color:#999999; font-weight:bold;}
-a.re_select{ display:block; width:88px; height:20px; border:1px solid #ff9900; color:#ff9900; margin-left:10px; padding-top:2px;}
-a:hover.re_select{ background:#ff9900; color:#fff; text-decoration:none;}
-a.re_open{display:block; width:46px; height:19px; border:1px solid #64bdd9; color:#64bdd9; margin-left:10px;padding-top:3px;}
-a:hover.re_open{ background:#64bdd9; color:#fff; text-decoration:none;}
+.re_select{ display:block; width:88px; height:20px; border:1px solid #ff9900; color:#ff9900; margin-left:10px; padding-top:2px;}
+.re_select:hover{ background:#ff9900; color:#fff; text-decoration:none;}
+.re_open{display:block; width:46px; height:19px; border:1px solid #64bdd9; color:#64bdd9; margin-left:10px;padding-top:3px;}
+.re_open:hover{ background:#64bdd9; color:#fff; text-decoration:none;}
a.re_de{ color:#6883b6; margin-left:15px;}
-a:hover.re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;}
+.re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;}
/****资源库***/
/*.setting{ background:url(../images/setting.jpg) 0 0 no-repeat; width:670px; height:443px;}*/
diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css
index fad1b835c..9ff5564d8 100644
--- a/public/stylesheets/leftside.css
+++ b/public/stylesheets/leftside.css
@@ -2,19 +2,13 @@
.topbar_info02 p{color: #7f7f7f;}
.search{ margin-top:8px; margin-left:71px;}
/*信息*/
-.project_info{ background:#fff; padding:10px; padding-right:0px;width:222px; padding-right:8px; margin-bottom:10px;}
+.project_info{ background:#fff; padding:10px;width:222px; padding-right:8px; margin-bottom:10px;}
.pr_info_id{ width:137px; color:#5a5a5a; font-size:14px; margin-top:5px;}
.pr_info_logo{ border:1px solid #eaeaea; width:60px; height:60px; padding:1px;}
.pr_info_logo:hover{ border:1px solid #64bdd9; }
.pr_info_join{}
-a.pr_join_a{ color:#fff; display:block; padding:0 5px 0 3px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background-color:#64bdd9; float:left; }
-a:hover.pr_join_a{ background:#41a8c8;}
-.pr_join_span{color: #fff; display:block; padding:0 5px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background: #CCC;}
-.pr_setting{ display:block; background:url(../images/leftside.png) -1px 0 no-repeat; width:11px; height:11px; margin-top:3px; float:left; }
-.pr_copy{ display:block; background:url(../images/leftside.png) -1px -23px no-repeat; width:11px; height:11px; margin-top:3px; float:left; }
-.pr_close{ display:block; background:url(../images/leftside.png) -1px -49px no-repeat; width:11px; height:11px; margin-top:3px; float:left; }
-.pr_add{display:block; background:url(../images/leftside.png) 0px -71px no-repeat; width:11px; height:11px; margin-top:3px; float:left; }
-.pr_arrow{display:block; background:url(../images/leftside.png) 0px -90px no-repeat; width:11px; height:11px; margin-top:3px; float:left; }
+.pr_info_join_a{ color:#fff; display:block; padding:0 5px; padding-top:2px; height:20px; margin-right:10px; float:left; text-align:center; }
+.pr_info_join a:hover{ background:#41a8c8;}
.pr_info_name{ color:#3e4040; font-size:14px; line-height:1.5;}
.pr_info_name:hover{ color:#3ca5c6;}
.pr_info_score{ font-size:14px; color:#3e4040; }
@@ -46,7 +40,7 @@ a:hover.pr_join_a{ background:#41a8c8;}
/*简介*/
.project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;}
-.course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;}
+.course_description{max-height: 112px;overflow:hidden;}
.course_description_none{max-height: none;}
.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;}
.lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 28d956bd8..70dc8e846 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -13,23 +13,31 @@ a:hover,a:active{color:#000;}
.fr{ float:right;}
.f_l{ float:left;}
.f_r{ float:right;}
-
+.ml5{ margin-left:5px;}
.ml10{ margin-left:10px;}
+.ml15{ margin-left:15px;}
.ml20{ margin-left:20px;}
+.ml45{ margin-left:45px;}
.ml30{ margin-left:30px;}
+.ml60{ margin-left:60px;}
+.ml80{ margin-left:80px;}
+.ml90{ margin-left:90px;}
.mr10{ margin-right:10px;}
.mr20{ margin-right:20px;}
.mr30{ margin-right:30px;}
+.mt3{ margin-top:3px;}
.mt5{ margin-top:5px;}
.mt10{ margin-top:10px;}
.mb5{ margin-bottom:5px;}
.mb10{ margin-bottom:10px;}
+.pl15{ padding-left:15px;}
h2{ font-size:18px; color:#15bccf;}
h3{ font-size:14px; color:#e8770d;}
h4{ font-size:14px; color:#3b3b3b;}
a.b_grey{ background: #F5F5F5;}
+a.b_dgrey{ background: #CCC;}
a.c_orange{color:#e8770d;}
a:hover.c_orange{color: #F30;}
a.c_lorange{color:#ff9900;}
@@ -47,19 +55,24 @@ a.b_green{background:#28be6c;}
a:hover.b_green{background:#14ad5a;}
a.c_blue02{color: #3ca5c6;}
a:hover.c_blue02{color: #0781b4;}
+a.c_red{ color:#F00;}
+a:hover.c_red{ color: #C00;}
.f14{ font-size:14px;}
.fb{ font-weight:bold;}
.f12{ font-size:12px; font-weight:normal;}
.b_grey{ background: #F5F5F5;}
+.b_dgrey{ background: #CCC;}
.c_orange{color:#e8770d;}
.c_lorange{ color:#ff9900;}
.c_purple{color: #6883b6;}
.c_blue{ color:#15bccf;}
+.c_red{ color:#F00;}
.c_dblue{ color:#09658c;}
.b_blue{background:#64bdd9;}
.b_green{background:#28be6c;}
+.b_w{ background:#fff;}
.more{ font-weight:normal; color:#999; font-size:12px;}
.no_line{ border-bottom:none;}
@@ -101,7 +114,7 @@ div#menu ul ul a.parent {background: url(../images/item.png) -20px 6px no-repea
div#menu ul ul a.parent:hover {background: url(../images/item.png) -20px -11px no-repeat;}
/* menu::level1 */
div#menu a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;}
-div#menu li { background: url(../images/main-delimiter.png) 98% 4px no-repeat; }
+/*div#menu li { background: url(../images/main-delimiter.png) 98% 4px no-repeat; }*/
div#menu li.last { background: none; }
/* menu::level2 */
div#menu ul ul li { background: none; }
@@ -114,9 +127,11 @@ div#menu ul ul li {width: 100%;}
div#menu ul ul ul {padding: 0;margin: -38px 0 0 92px !important; width:140px; }
div#menu ul ul ul li a{ width:125px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf;}
+
/*主类容*/
#Main{ background:#fff; margin-bottom:10px;}
-#Content{ }
+#content{}
+#content02{ background:#fff; padding:10px; margin-bottom:10px;}
/*主类容搜索*/
#TopBar{ height:60px; margin-bottom:10px; background:#fff;}
.topbar_info02{ margin:5px 10px;width:480px; }