kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs

This commit is contained in:
cxt 2017-07-26 19:41:22 +08:00
parent 66e2c3d043 709cfb93d5
commit f2da429849
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/courses/index.html.erb
View File

@ -2,7 +2,7 @@
<div class="task-index-head mt20 mb20">
<div class="task-index-head-top-course">
<h2 class="fl task-inde-head-title">在线课堂</h2>
<%= link_to "<span class='font-22'>+</span>&nbsp;创建课堂".html_safe, new_course_path, :class => "fr color_white font-20" %>
<%= link_to "+&nbsp;新建".html_safe, new_course_path, :class => "task-btn task-btn-green fr mt6" %>
<div class="cl"></div>
</div>
<ul class="task-index-head-info clearfix">

2
app/views/shixuns/index.html.erb
View File

@ -2,7 +2,7 @@
<div class="task-index-head mt20 mb20 user_bg_shadow">
<div class="task-index-head-top">
<h2 class="fl task-inde-head-title">全部实训</h2>
<%= link_to "<span class='font-22'>+</span>&nbsp;创建实训".html_safe, new_shixun_path, :class => "fr color_white font-20" %>
<%= link_to "+&nbsp;新建".html_safe, new_shixun_path, :class => "task-btn task-btn-green fr mt6" %>
<div class="cl"></div>
</div>
<ul class="task-index-head-info clearfix">

2
app/views/subjects/index.html.erb
View File

@ -3,7 +3,7 @@
<div class="task-index-head mt20 mb20">
<div class="header-color">
<h2 class="fl task-inde-head-title">实训套件</h2>
<%= link_to "<span class='font-22'>+</span>&nbsp;创建套件".html_safe, new_subject_path(), :class => "fr color_white font-20" %>
<%= link_to "+&nbsp;新建".html_safe, new_subject_path(), :class => "task-btn task-btn-green fr mt6" %>
<div class="cl"></div>
</div>
<ul class="task-index-head-info clearfix">

2
public/stylesheets/css/edu-subject.css
View File

@ -1,5 +1,5 @@
/*------课程实训首页---------*/
.header-color{background: linear-gradient(304.95deg, rgb(0, 158, 138) 0%, rgb(22, 212, 190) 100%) rgb(22, 212, 190);padding: 30px}
.header-color{background: linear-gradient(to right, rgb(68, 190, 164) 0%, rgb(62, 158, 207) 100%);padding: 30px}
.active-class .content .sub-con{width:23.7%;border:1px solid #eee;background:#fff;margin: 0 1.5% 1.5% 0px;box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);}
.active-class .content .sub-con:nth-child(4n+0){margin:0 0 1.5% 0;}
.active-class .content .sub-con:hover{box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.15);cursor: pointer;-webkit-animation: bounce-down 1s linear 1;animation: bounce-down 1s linear 1;}

4
public/stylesheets/css/taskstyle.css
View File

@ -218,8 +218,8 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f
.task-index{ width: 1200px; margin:0 auto;}
.task-index-head{ box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); }
/*.task-index-head-top{background-image: linear-gradient(to right, rgb(106, 177, 216) 0%, rgb(1, 74, 78) 100%);background-color: rgb(1, 70, 74); padding:30px;}*/
.task-index-head-top{background: #1ECDCE linear-gradient(to top left, #48A7D1 0%, #1ECDCE 100%);background-color: rgb(1, 70, 74); padding:30px;}
.task-index-head-top-course{background: linear-gradient(to right, rgb(162, 171, 234) 0%, rgb(114, 123, 177) 100%);background-color:rgb(160, 175, 247); padding:30px;}
.task-index-head-top{background: linear-gradient(to right, rgb(104, 177, 215) 0%, rgb(1,75,79) 100%);background-color: rgb(1, 70, 74); padding:30px;}
.task-index-head-top-course{background: linear-gradient(to right, rgb(69, 191, 165) 0%, rgb(164, 175, 247) 100%);background-color:rgb(160, 175, 247); padding:30px;}
.task-inde-head-title{ color:#fff; }
.task-index-head-info{ background:#fff; padding:10px 30px;}
.task-index-head-info li{ width:100px; float: left; text-align: center; color:#666;}