From b604f79dbf42cd3413f6fcc0eea43491e88e26ee 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, 15 Aug 2019 10:50:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E8=88=AA=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/public/css/css_min_all.css  | 4 +++-
 public/react/public/css/edu-common.css   | 4 +++-
 public/stylesheets/educoder/edu-all.css  | 4 +++-
 public/stylesheets/educoder/edu-main.css | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/public/react/public/css/css_min_all.css b/public/react/public/css/css_min_all.css
index a011c4d4..cc900282 100644
--- a/public/react/public/css/css_min_all.css
+++ b/public/react/public/css/css_min_all.css
@@ -4,7 +4,9 @@ html{height:100%;}
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
 .newMain{ margin: 0 auto; padding-bottom: 155px; min-width:1200px }
 .newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;}
-.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:99998}
+.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;
+    /*position: fixed;*/
+    top: 0px;left: 0px;z-index:99998}
 /* 重置样式 */
 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 { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5; color:#333;}
diff --git a/public/react/public/css/edu-common.css b/public/react/public/css/edu-common.css
index cd21d94c..a53b2975 100644
--- a/public/react/public/css/edu-common.css
+++ b/public/react/public/css/edu-common.css
@@ -4,7 +4,9 @@ html{height:100%;}
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
 .newMain{ margin: 0 auto; padding-bottom: 155px; min-width:1200px }
 .newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;}
-.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:99998}
+.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;
+    /*position: fixed;*/
+    top: 0px;left: 0px;z-index:99998}
 /* 重置样式 */
 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 { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5; color:#333;}
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 6947ac54..2c216700 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -1,6 +1,8 @@
 /*--------------------------首页*/
 /*头部导航条样式---2018-03-19--by-cs*/
-.newHeader{background: #24292D;width:100%; height: 60px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);}
+.newHeader{background: #24292D;width:100%; height: 60px; min-width: 1200px;
+    /*position: fixed;*/
+    top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);}
 .newHeader .logoimg{
     margin-top: 16px;
     float: left;
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index 94d38790..f87f9b28 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -192,7 +192,9 @@ input::-ms-clear{display:none;}
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
 .educontent{width: 1200px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/
 .educontents{margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/
-.newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;padding-top: 60px}/*padding-bottom根据底部的高度而定*/
+.newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;
+    /*padding-top: 60px*/
+}/*padding-bottom根据底部的高度而定*/
 .newMain{ padding-bottom: 110px !important; }
 
 /*高度*/