From a7efa67343471562f36a01ad55dd5aa11ba6e65d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 Jan 2017 10:47:45 +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/welcome/index.html.erb | 2 +-
 public/stylesheets/css/login.css | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index c74331a26..4b4c923e5 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -64,7 +64,7 @@
 <div class="new-container back-color-grey">
   <div class="new-container-inner clearfix">
     <div class="inner-img fl " style="margin-left:120px;"><img src="images/inner/inner-banner02.jpg" width="651" alt="高校教育大数据服务平台"></div>
-    <div class="inner-txtbox fr  " style="margin-right:80px;">
+    <div class="inner-txtbox fr mt50 " style="margin-right:80px;">
       <h3 class="innerbox-txt-h3">项目社区</h3>
       <p class="innerbox-txt-p">支持分组开发与实验<br>提供灵活的分布式协同手段</p>
       <div class="mb10" style="height: 10px; border-bottom: 1px solid #60B25E;">&nbsp;</div>
diff --git a/public/stylesheets/css/login.css b/public/stylesheets/css/login.css
index f1f86940c..7b91d1eb8 100644
--- a/public/stylesheets/css/login.css
+++ b/public/stylesheets/css/login.css
@@ -44,7 +44,7 @@ a:hover.new-bigbtn{background: #c3c3c3; color: #333;}
 a.new-bigbtn-green{display: block;  background:#60B25E;  color:#fff;  border-radius:5px;  text-align:center; font-size:18px; padding: 5px 20px; width: 220px;}
 a.new-bigbtn-green:hover{background: #51a74f; color: #fff;}
 /* 头部 */
-.header{ width:100%; height:51px;background:#46484c;  }
+.header{ width:100%; min-width: 1200px; height:51px;background:#46484c;  }
 .header_con{ width:1200px; height:50px; margin:0 auto;  }
 .new-logo img{ width: 45px; height: 45px; margin-top:3px;}
 .new-logo p{ font-size: 18px; color:#fff; line-height: 50px; }
@@ -117,7 +117,7 @@ a:hover.btn-blue-line{background: #3b94d6; color:#fff;}
 .innerbox-txt{ width:300px;}
 .back-color-black{ background:#47494d;}
 .inner-t-c{ text-align: center;}
-.inner-footer{ width: 100%; background:#323232; padding-bottom:30px;}
+.inner-footer{ width: 100%;min-width: 1200px; background:#323232; padding-bottom:30px;}
 .inner-footer_con{ width: 1200px; margin: 0 auto;}
 .inner-footer-nav{ height: 50px; border-bottom:1px solid #47494d;}
 .inner-footer-nav li a{ float: left; margin-right:15px; font-size: 14px; color: #888; line-height: 50px;}