From 81eb573c039ae61e7d3e6b7445069d674e20f2c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 11 Apr 2019 14:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E8=AF=BE=E5=A0=82=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E9=97=B4=20=E6=A0=B9=E6=8D=AE=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=A6=81=E6=B1=82=E8=B0=83=E6=95=B4=E6=BB=91=E5=8A=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/cooperates/_partner_item.html.erb | 14 ++++++++------
 public/stylesheets/educoder/edu-main.css    | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/views/cooperates/_partner_item.html.erb b/app/views/cooperates/_partner_item.html.erb
index a094c452..09490e39 100644
--- a/app/views/cooperates/_partner_item.html.erb
+++ b/app/views/cooperates/_partner_item.html.erb
@@ -1,23 +1,25 @@
 <p class="clearfix edu-back-white">
   <span class="column-No">序号</span>
-  <span class="column-2">单位名称</span>
-  <span class="column-2">教师</span>
-  <span class="column-2">学生</span>
+  <span class="column-1">单位名称</span>
+  <span class="column-1">教师</span>
+  <span class="column-1">学生</span>
   <span class="column-2">课堂</span>
   <span class="column-2">发布实训</span>
   <span class="column-2">实训报告</span>
+  <span class="column-2">最新课堂动态时间</span>
   <span class="column-2 fr">使用详情</span>
 </p>
 <ul class="minH-560 edu-back-white pb20 courselist">
   <% @schools.each_with_index do |school, index| %>
     <li class="clearfix bor-bottom-greyE" id="major_list">
       <span class="column-No major_index"><%= index + 1 %></span>
-      <span class="column-2"><%= school.name %></span>
-      <span class="column-2"><%= school.teacher_count %></span>
-      <span class="column-2"><%= school.student_count %></span>
+      <span class="column-1"><%= school.name %></span>
+      <span class="column-1"><%= school.teacher_count %></span>
+      <span class="column-1"><%= school.student_count %></span>
       <span class="column-2"><%= school.course_count %></span>
       <span class="column-2"><%= school.shixun_count %></span>
       <span class="column-2"><%= school.shixun_report_count %></span>
+      <span class="column-2">2019-04-11 时间</span>
       <span class="column-2 fr">
         <% if school.statistic_url != "" %>
           <a href="<%= school.statistic_url %>" target="_blank" class="color-blue">查看</a>
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index 9912bd61..dac31425 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -3,6 +3,22 @@
 body{font-size:14px; line-height:2.0;background:#fafafa!important;font-family: "微软雅黑","宋体"; color:#05101a;height: 100%;position: relative;
 }
 html,body{height:100%;}
+/*滚动条样式*/
+body::-webkit-scrollbar {/*滚动条整体样式*/
+    width: 8px;     /*高宽分别对应横竖滚动条的尺寸*/
+    height: 8px;
+}
+body::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+    border-radius: 5px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background: #47494d;
+}
+body::-webkit-scrollbar-track {/*滚动条里面轨道*/
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    border-radius: 0;
+    background: rgba(0,0,0,0.1);
+}
+
 body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;}
 table,input,textarea,select,button {outline: none;border-radius: 3px; font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9;border:1px solid #eaeaea;background: #FFFFff; color:#05101A;}
 textarea{resize: none;}