diff --git a/.idea/bigdate.iml b/.idea/bigdate.iml
index c92bd62e0..def4eded2 100644
--- a/.idea/bigdate.iml
+++ b/.idea/bigdate.iml
@@ -13,46 +13,28 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -77,26 +59,46 @@
-
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -106,10 +108,10 @@
-
+
-
+
@@ -121,7 +123,7 @@
-
+
@@ -135,7 +137,7 @@
-
+
@@ -153,7 +155,7 @@
-
+
@@ -164,121 +166,113 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index eed3339c2..b7bd531f9 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -4,25 +4,25 @@
mysql
com.mysql.jdbc.Driver
- jdbc:mysql://127.0.0.1/test
+ jdbc:mysql://127.0.0.1/trustie2
root
- dfcbdfc6dfcbdfc4dfc6dfc5dfc4dfcd
+ df9bdf98df99df9edf9fdf9c
mysql
com.mysql.jdbc.Driver
- jdbc:mysql://127.0.0.1/test
+ jdbc:mysql://127.0.0.1/trustie2
root
- dfcbdfc6dfcbdfc4dfc6dfc5dfc4dfcd
+ df9bdf98df99df9edf9fdf9c
mysql
com.mysql.jdbc.Driver
- jdbc:mysql://127.0.0.1/test
+ jdbc:mysql://127.0.0.1/trustie2
root
- dfcbdfc6dfcbdfc4dfc6dfc5dfc4dfcd
+ df9bdf98df99df9edf9fdf9c
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 9d21af2af..d5df9c2e9 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -26,7 +26,7 @@
- <%= link_to image_tag("/images/bigdata/bigdata-logo.png",width:"50px", height: "50px", alt:"高校智能化教学与实训平台", class:"fl"), home_path %>
+ <%= link_to image_tag("/images/bigdata/bigdata-logo.png",width:"50px", height: "50px", alt:"高校智能化教学与实训平台", class:"fl edu-footer-logo"), home_path %>
diff --git a/public/images/bigdata/bigdata-logo.png b/public/images/bigdata/bigdata-logo.png
index 80d4ab1d9..6450ce6d9 100644
Binary files a/public/images/bigdata/bigdata-logo.png and b/public/images/bigdata/bigdata-logo.png differ
diff --git a/public/stylesheets/css/bigdata-login.css b/public/stylesheets/css/bigdata-login.css
index a9bac1040..013c00086 100644
--- a/public/stylesheets/css/bigdata-login.css
+++ b/public/stylesheets/css/bigdata-login.css
@@ -71,7 +71,7 @@ a:hover.wx_help{ text-decoration: underline;}
.inner-banner-con h2{ font-size: 60px; font-weight: normal;}
.inner-banner-con-h3{font-size: 24px; font-weight: normal; color: #fff;}
.inner-c_blue{ color:#3b94d6;}
-a.btn-blue{ display: block; width:265px; height:40px; line-height: 40px; background:#3b94d6; color:#fff; font-size:14px; border-radius:5px; text-align:center;border: 3px solid #3b94d6; font-weight: bold; }
+a.btn-blue{ display: block; width:265px; height:40px; line-height: 40px; background:#3b94d6; color:#fff!important; font-size:14px; border-radius:5px; text-align:center;border: 3px solid #3b94d6; font-weight: bold; }
a:hover.btn-blue{background: #2384cd; border: 3px solid #2384cd;}
a.btn-blue-line{ display: block; width:265px; height:40px; line-height: 40px; border: 3px solid #3b94d6; color:#3b94d6; font-size:14px; border-radius:5px; text-align:center; font-weight: bold; }
a:hover.btn-blue-line{background: #3b94d6; color:#fff;}
diff --git a/public/stylesheets/css/bigdata-public.css b/public/stylesheets/css/bigdata-public.css
index b28d6fe80..6ca8ecd82 100644
--- a/public/stylesheets/css/bigdata-public.css
+++ b/public/stylesheets/css/bigdata-public.css
@@ -71,6 +71,7 @@ $colors: #fff, #0072B5, #2C3E50;
.inner-footer-p-big{ display: block; height: 50px; line-height: 50px; color:#888; font-size: 16px; border-left:2px solid #888; padding-left:15px;}
.inner-btnbox02{ width:270px; margin: 30px auto 0;}
.new-container-inner02{width:1200px; margin:0px auto; padding:50px 0;}
+img.edu-footer-logo{ border-radius:100px; height: 50px;}
/************布局 byLB****************/
.panel-content{ width: 1200px; margin:20px auto; background:#fff;}
/************讨论区20170321 byLB****************/