Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course

This commit is contained in:
sw 2015-03-20 16:34:10 +08:00
commit aa240a759a
2 changed files with 7 additions and 7 deletions

View File

@ -2,7 +2,7 @@
<% sufixtypes = @course.contenttypes %>
<%= stylesheet_link_tag 'resource', :media => 'all' %>
<!--<%#= stylesheet_link_tag 'resource', :media => 'all' %> -->
<script>
function show_upload()
{

View File

@ -112,15 +112,15 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
.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; }
.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; }
.re_fabu:hover{background:#55a1b9;}
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_con{ margin:5px; width:665px;}
.re_con_top{color:#494949; }
.re_con_top span{ color:#999999; font-weight:bold;}
.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_select{ display:block;height:20px; border:1px solid #ff9900; color:#ff9900; margin-left:10px; padding:2px 5px 1px;}
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;}
a.re_de{ color:#6883b6; margin-left:15px;}
.re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;}
/****资源库***/