Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

cxt_course
cxt 9 years ago
commit f4b5a5cf4e

@ -30,7 +30,7 @@
<div class="cl"></div>
<div class="sy_class_logo fl">
<%= image_tag(url_to_avatar(@course), :width => "110", :height => "110", :alt => "班级logo") %>
<%= image_tag(url_to_avatar(@course), :width => "96", :height => "96", :alt => "班级logo") %>
</div>
<div class="sy_class_id fl">
<p>邀 请 码<br />
@ -54,7 +54,7 @@
</p>
<div class="cl"></div>
</div>
<p class="sy_cgrey mb10">
<p class="sy_cgrey mb5">
<span class=" mr15">主讲老师:<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %></span>
<span class=" mr15">学时:<span class="sy_cblack"><%= @course.class_period %>学时</span></span>
<span class=" mr15">学期:<span class="sy_cblack"><%= current_time_and_term @course %></span></span>

@ -554,31 +554,4 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
.icons_project_favorite {background: url(/images/syllabus/sy_icons_star.png) 0px 0px no-repeat; width:20px; height:20px; display:block; float:left;}
.icons_project_star{background: url(/images/syllabus/sy_icons_star.png) 0px -27px no-repeat; width:20px; height:20px; display:block; float:left;}
.new_projectlist_more{ text-align:center;}
.new_projectlist_more a:hover{ color:#3b94d6;}
/*新版项目引用的新版课程大纲中的公共样式*/
.icons_tishi{
width: 110px;
height: 110px;
margin: 135px auto 20px;
}
.sy_tab_con_p{
font-size: 16px;
text-align: center;
margin-bottom:100px;
color:#888;
}
a.sy_btn_green{
display:inline-block;
color: #fff;
background: #60b25e;
text-align: center;
font-size: 12px;
padding:0 15px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.sy_btn_green{ background: #51a74f;}
.new_projectlist_more a:hover{ color:#3b94d6;}

@ -1418,4 +1418,31 @@ a:hover.comment_ding_link{ color:#269ac9;}
}
a.syllabusbox_a_blue{
color:#3b94d6 !important;
}
}
.icons_tishi{
width: 110px;
height: 110px;
margin: 135px auto 20px;
}
.sy_tab_con_p{
font-size: 16px;
text-align: center;
margin-bottom:100px;
color:#888;
}
a.sy_btn_green{
display:inline-block;
color: #fff;
background: #60b25e;
text-align: center;
font-size: 12px;
padding:0 15px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.sy_btn_green{ background: #51a74f;}

@ -109,21 +109,6 @@ a:hover.btn_green_big{
background: #60b25e;
color: #fff;
}
a.sy_btn_green{
display:inline-block;
color: #fff;
background: #60b25e;
text-align: center;
font-size: 12px;
padding:0 15px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.sy_btn_green{ background: #51a74f;}
/*a.sy_btn_grey{*/
/*color: #333;*/

@ -169,17 +169,6 @@ a.syllabus_class_title{ font-size:14px; color:#333; max-width:480px; margin-bott
border-bottom:none;
}
/* 课程大纲 */
.icons_tishi{
width: 110px;
height: 110px;
margin: 135px auto 20px;
}
.sy_tab_con_p{
font-size: 16px;
text-align: center;
margin-bottom:100px;
color:#888;
}
.sy_classlist{
padding: 15px 15px;
border-bottom: 1px dashed #e6e6e6;
@ -325,16 +314,16 @@ a.sy_class_option:hover {
}
.sy_class_logo{
width:110px;
height:110px;
width:96px;
height:96px;
}
.sy_class_id{
width:108px;
height:78px;
width:94px;
height:70px;
border:1px solid #f1f1f1;
background:#fff;
text-align:center;
padding-top:30px;
padding-top:24px;
}
.sy_class_id p{
font-size:16px;
@ -380,7 +369,7 @@ a.sy_class_option:hover {
line-height: 22px;
}
.sy_class_titbox{margin-bottom:5px; padding-top:10px; }
.sy_class_titbox{ padding-top:5px; }
a.sy_btn_orange{
display:block;
border:1px solid #ee4a1f;
@ -430,9 +419,9 @@ a:hover.sy_btn_orange{
.accordion li > a span {
margin-top:15px;
font-size:12px;
font-size:11px;
padding: 0 10px;
background: #ccc;
background: #eee;
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
@ -444,7 +433,7 @@ a:hover.sy_btn_orange{
.accordion > li > a.active span {
margin-left:10px;
color: #888;
background: #ccc;
background: #ddd;
}
/* Images */
.accordion > li > a:before {

Loading…
Cancel
Save