From 433028482728dac5a1dbaea3e4ee548928bb33e0 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 26 Jul 2017 19:34:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=96=B0=E5=BB=BATPM=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=9A=90=E8=97=8F=E6=98=BE=E7=A4=BA=E2=80=9C=E9=A2=84?=
 =?UTF-8?q?=E5=A4=87=E7=9F=A5=E8=AF=86=E2=80=9D=E7=BC=96=E8=BE=91=E5=9D=97?=
 =?UTF-8?q?=202.=E5=AE=9E=E8=AE=AD=E9=A6=96=E9=A1=B5=E9=9A=90=E8=97=8Ftab?=
 =?UTF-8?q?=E6=95=B4=E9=A1=B5=E2=80=9C=E9=A2=84=E5=A4=87=E7=9F=A5=E8=AF=86?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/index.html.erb       | 2 +-
 app/views/layouts/base_shixun.html.erb | 2 +-
 app/views/shixuns/_form.html.erb       | 6 +++---
 app/views/shixuns/index.html.erb       | 2 +-
 app/views/subjects/index.html.erb      | 2 +-
 public/stylesheets/css/edu-subject.css | 2 +-
 public/stylesheets/css/taskstyle.css   | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb
index 846113e1b..63b19f47a 100644
--- a/app/views/courses/index.html.erb
+++ b/app/views/courses/index.html.erb
@@ -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">
diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb
index b584a4ce2..7684a7a95 100644
--- a/app/views/layouts/base_shixun.html.erb
+++ b/app/views/layouts/base_shixun.html.erb
@@ -27,7 +27,7 @@
     <div class="task-header-nav">
       <ul class="task-header-navs clearfix">
         <li><a href="<%= shixun_challenges_url(@shixun) %>" class="<%= params[:action] == "index" ? "active" : "" %>" >实训</a></li>
-        <li><a href="<%= propaedeutics_shixun_path(@shixun) %>" class="<%= params[:action] == "propaedeutics" ? "active" : "" %>" >预备知识</a></li>
+        <!--<li><a href="<%#= propaedeutics_shixun_path(@shixun) %>" class="<%#= params[:action] == "propaedeutics" ? "active" : "" %>" >预备知识</a></li>-->
         <% if User.current.manager_of_shixun?(@shixun) %>
             <li>
               <%= link_to l(:project_module_repository),
diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb
index 6607e749c..f3c309809 100644
--- a/app/views/shixuns/_form.html.erb
+++ b/app/views/shixuns/_form.html.erb
@@ -28,15 +28,15 @@
               <p id="e_tip_in" style="margin-left: 10%" class="c_grey"></p>
               <p id="e_tips_in" style="margin-left: 10%" class="c_grey"></p>
             </li>
-            <li class="clearfix mb15">
+           <!-- <li class="clearfix mb15">
               <label class="panel-form-label fl">预备知识&nbsp;&nbsp;&nbsp;</label>
               <div id="shixun_propaedeutics" class="new_li fl" style="margin-left: 0px;">
-                <textarea name="shixun[propaedeutics]"><%= @shixun.propaedeutics %></textarea>
+                <textarea name="shixun[propaedeutics]"><%#= @shixun.propaedeutics %></textarea>
               </div>
               <p id="e_tip_pr" style="margin-left: 10%" class="c_grey"></p>
               <p id="e_tips_pr" style="margin-left: 10%" class="c_grey"></p>
               <div class="cl"></div>
-            </li>
+            </li>-->
             <li class="clearfix mb15">
               <label class="panel-form-label fl"><span class="color-orange mr5">*</span>适用专业&nbsp;&nbsp;&nbsp;</label>
               <%= select_tag :major_id, options_for_select(shixun_major_option, 0), :id => 'shixun_major', :class => "fl task-form-30 task-height-40"%>
diff --git a/app/views/shixuns/index.html.erb b/app/views/shixuns/index.html.erb
index 4b27c9cf0..760c04eb7 100644
--- a/app/views/shixuns/index.html.erb
+++ b/app/views/shixuns/index.html.erb
@@ -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">
diff --git a/app/views/subjects/index.html.erb b/app/views/subjects/index.html.erb
index 7efca3b78..355a579f2 100644
--- a/app/views/subjects/index.html.erb
+++ b/app/views/subjects/index.html.erb
@@ -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">
diff --git a/public/stylesheets/css/edu-subject.css b/public/stylesheets/css/edu-subject.css
index 21078c0fa..7a671a79d 100644
--- a/public/stylesheets/css/edu-subject.css
+++ b/public/stylesheets/css/edu-subject.css
@@ -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;}
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index a779ecd60..1ec946ed9 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -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;}

From 709cfb93d53dd1aefc7b44761f7eb967fb5d5c0d Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 26 Jul 2017 19:39:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=92=A4=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_shixun.html.erb | 2 +-
 app/views/shixuns/_form.html.erb       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb
index 7684a7a95..b584a4ce2 100644
--- a/app/views/layouts/base_shixun.html.erb
+++ b/app/views/layouts/base_shixun.html.erb
@@ -27,7 +27,7 @@
     <div class="task-header-nav">
       <ul class="task-header-navs clearfix">
         <li><a href="<%= shixun_challenges_url(@shixun) %>" class="<%= params[:action] == "index" ? "active" : "" %>" >实训</a></li>
-        <!--<li><a href="<%#= propaedeutics_shixun_path(@shixun) %>" class="<%#= params[:action] == "propaedeutics" ? "active" : "" %>" >预备知识</a></li>-->
+        <li><a href="<%= propaedeutics_shixun_path(@shixun) %>" class="<%= params[:action] == "propaedeutics" ? "active" : "" %>" >预备知识</a></li>
         <% if User.current.manager_of_shixun?(@shixun) %>
             <li>
               <%= link_to l(:project_module_repository),
diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb
index f3c309809..6607e749c 100644
--- a/app/views/shixuns/_form.html.erb
+++ b/app/views/shixuns/_form.html.erb
@@ -28,15 +28,15 @@
               <p id="e_tip_in" style="margin-left: 10%" class="c_grey"></p>
               <p id="e_tips_in" style="margin-left: 10%" class="c_grey"></p>
             </li>
-           <!-- <li class="clearfix mb15">
+            <li class="clearfix mb15">
               <label class="panel-form-label fl">预备知识&nbsp;&nbsp;&nbsp;</label>
               <div id="shixun_propaedeutics" class="new_li fl" style="margin-left: 0px;">
-                <textarea name="shixun[propaedeutics]"><%#= @shixun.propaedeutics %></textarea>
+                <textarea name="shixun[propaedeutics]"><%= @shixun.propaedeutics %></textarea>
               </div>
               <p id="e_tip_pr" style="margin-left: 10%" class="c_grey"></p>
               <p id="e_tips_pr" style="margin-left: 10%" class="c_grey"></p>
               <div class="cl"></div>
-            </li>-->
+            </li>
             <li class="clearfix mb15">
               <label class="panel-form-label fl"><span class="color-orange mr5">*</span>适用专业&nbsp;&nbsp;&nbsp;</label>
               <%= select_tag :major_id, options_for_select(shixun_major_option, 0), :id => 'shixun_major', :class => "fl task-form-30 task-height-40"%>