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; } /*高度*/