From 78e4d37d8bc6b55bb0c1bf96eeda87d31f006942 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 20 Jul 2016 15:09:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E7=BA=B2base=E9=A1=B5=E5=BC=95?=
 =?UTF-8?q?=E5=85=A5=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=EF=BC=9B=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_syllabus.html.erb | 2 +-
 public/stylesheets/css/common.css        | 2 +-
 public/stylesheets/css/structure.css     | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb
index 37e77c5a8..45e77dbad 100644
--- a/app/views/layouts/base_syllabus.html.erb
+++ b/app/views/layouts/base_syllabus.html.erb
@@ -7,7 +7,7 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','css/common','css/public','css/structure','css/courses','prettify',:media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','css/common','css/public','css/structure','css/courses','css/popup','prettify',:media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus'%>
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index 06370489f..1ec98b1cf 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -319,7 +319,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .td_w110{ width:110px;}
 
 .width165{width: 165px;}
-.width180{width: 180px;}
+.width180{width: 180px !important;}
 .width285{width: 285px;}
 .width255{width: 255px;}
 .width385{width: 385px;}
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index ef9b3bc3e..b2cba2483 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -356,7 +356,6 @@ a.menuGrey {color:#808080;}
 a.menuGrey:hover {color:#fe7d68;}
 .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
 #navSearchAlert {display:none;}
-.none{display: none;}
 
 /*151228侧导航样式更新*/
 .menuSetting {background:url(../images/hwork_icon.png) -5px -303px no-repeat; display:inline-block; width:20px; height:20px;}