From d2f659476e4c05be87f8beeeaf9da9925052f1ac Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 21 Apr 2017 22:51:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb        | 2 +-
 app/views/layouts/base_new_forum.html.erb         | 2 +-
 app/views/layouts/base_project_community.html.erb | 2 +-
 app/views/layouts/base_projects.html.erb          | 2 +-
 public/javascripts/application.js                 | 2 +-
 public/stylesheets/css/bigdata-user.css           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index e85c48b66..4c9584eda 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -1,6 +1,6 @@
 <div class="header_con clearfix">
   <div class="fl clearfix new-logo">
-    <%= link_to image_tag("../images/bigdata/new-logo.png",width:"45px", height: "45px", alt:"高校教育大数据服务平台", class:"fl "), home_path %>
+    <%= link_to image_tag("../images/bigdata/bigdata-logo.png",width:"45px", height: "45px", alt:"高校教育大数据服务平台", class:"fl "), home_path %>
   </div>
   <div class="header-search fl mt10 ml15 mr15">
     <dropdown class="fl">
diff --git a/app/views/layouts/base_new_forum.html.erb b/app/views/layouts/base_new_forum.html.erb
index 63a224d76..a6b8d163e 100644
--- a/app/views/layouts/base_new_forum.html.erb
+++ b/app/views/layouts/base_new_forum.html.erb
@@ -11,7 +11,7 @@
   <%= heads_for_theme %>
   <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
-  <%= stylesheet_link_tag 'css/common','css/structure','css/public','css/forum','css/popup', 'css/font-awesome','css/moduel', 'css/font-awesome', :media => 'all'%>
+  <%= stylesheet_link_tag 'css/bigdata-popup','css/bigdata-common', "css/bigdata-public",'css/common','css/structure','css/public','css/forum','css/popup', 'css/font-awesome','css/moduel', 'css/font-awesome', :media => 'all'%>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
diff --git a/app/views/layouts/base_project_community.html.erb b/app/views/layouts/base_project_community.html.erb
index 67960fa5f..141b75dba 100644
--- a/app/views/layouts/base_project_community.html.erb
+++ b/app/views/layouts/base_project_community.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','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', 'css/font-awesome', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/bigdata-popup','css/bigdata-common', "css/bigdata-public",'css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', 'css/font-awesome', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 3ddbee3a3..e172b7b50 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -9,7 +9,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/font-awesome' %>
+  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/bigdata-popup','css/bigdata-common', "css/bigdata-public",'css/common','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/font-awesome' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index a6a879850..5083543a6 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -663,7 +663,7 @@ function set_footer(){
             });
         }
     }
-    $(window).scroll(positionFooter).resize(positionFooter);
+    //$(window).scroll(positionFooter).resize(positionFooter);
 }
 
 function setupHeartBeat(){
diff --git a/public/stylesheets/css/bigdata-user.css b/public/stylesheets/css/bigdata-user.css
index 3119e7edb..b777ded37 100644
--- a/public/stylesheets/css/bigdata-user.css
+++ b/public/stylesheets/css/bigdata-user.css
@@ -122,7 +122,7 @@
 .-task-sidebar{position:fixed;width:35px;height:20%;right:5%;bottom:5%;z-index: 10;}
 .-task-sidebar div{width:35px;height:28px;margin-bottom:3px;background:cornflowerblue;color:#fff;font-size:20px;text-align:center;padding-top:7px;}
 .-task-sidebar div:hover {background:#ccc;}
-.-task-desc{background:#494949;width:90px;height:35px;line-height: 35px;text-align: center;
+.-task-desc{background:#494949;width:90px;line-height: 35px;text-align: center;
     position: absolute;color: #fff;font-size: 13px;z-index: 10;opacity: 0;}
 .-task-desc div{position: absolute;top: 10px;right: -7px;}