From 473715d048cfce497c1636565743f48474a79a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 16 Nov 2019 16:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BA=95=E9=83=A8=E5=AF=BC?= =?UTF-8?q?=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/css_min_all.css | 5 ++++- public/react/public/css/edu-all.css | 5 ++++- public/react/public/css/edu-common.css | 5 ++++- public/react/src/modules/tpm/NewFooter.js | 9 --------- public/stylesheets/css/edu-common.css | 5 ++++- public/stylesheets/educoder/edu-all.css | 9 +++++++-- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/public/react/public/css/css_min_all.css b/public/react/public/css/css_min_all.css index 5f5362c2e..cf453ac21 100755 --- a/public/react/public/css/css_min_all.css +++ b/public/react/public/css/css_min_all.css @@ -3,7 +3,10 @@ body{font-size:14px; line-height:2.0;background:#ffffff!important;font-family: " 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;} +.newFooter{ + max-height: 110px; +} +.newFooter{ position: absolute; bottom: 0; width: 100%;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} /* 重置样式 */ 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;} diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index cb78f8e00..abdf253b1 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -71,7 +71,10 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .search-title{height: 40px;line-height: 40px;padding-left: 20px;font-size: 12px;color: #bbb;text-align: left} .search-content a{display: inline-block;width:100%;height: 30px;line-height: 30px;padding:0px 20px;box-sizing: border-box;text-align: left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;} /*底部*/ -.newFooter{ position: absolute; bottom: 0; width: 100%; height: 235px;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;} +.newFooter{ + max-height: 110px; +} +.newFooter{ position: absolute; bottom: 0; width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;} .footercon{border-bottom:1px solid #47494d;} .inner-footernav{width: 560px;margin: 0px auto} .inner-footernav li{float: left;height: 50px;width: 80px;text-align: center} diff --git a/public/react/public/css/edu-common.css b/public/react/public/css/edu-common.css index 8293010d2..25f758144 100755 --- a/public/react/public/css/edu-common.css +++ b/public/react/public/css/edu-common.css @@ -3,7 +3,10 @@ body{font-size:14px; line-height:2.0;background:#ffffff!important;font-family: " 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;} +.newFooter{ + max-height: 110px; +} +.newFooter{ position: absolute; bottom: 0; width: 100%; 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} /* 重置样式 */ 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;} diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js index c378a1074..4ff1cc46a 100644 --- a/public/react/src/modules/tpm/NewFooter.js +++ b/public/react/src/modules/tpm/NewFooter.js @@ -19,15 +19,6 @@ class NewFooter extends Component { return (
{/*newContainers*/} - {this.props.user&&this.props.user.main_site===false?:""}
{this.props.user&&this.props.user.main_site===true?
{/*
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index 7997c8c8d..517d13196 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -3,7 +3,10 @@ body{font-size:14px; line-height:2.0;background:#ffffff!important;font-family: " 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;} +.newFooter{ + max-height: 110px; +} +.newFooter{ position: absolute; bottom: 0; width: 100%; background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;} /* 重置样式 */ 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 5aa83f28e..79fab5c25 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -71,9 +71,14 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .search-title{height: 40px;line-height: 40px;padding-left: 20px;font-size: 12px;color: #bbb;text-align: left} .search-content a{display: inline-block;width:100%;height: 30px;line-height: 30px;padding:0px 20px;box-sizing: border-box;text-align: left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;} /*底部*/ -.newFooter{ position: absolute; bottom: 0; width: 100%; height: 235px;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;} +.newFooter{ + max-height: 110px; +} +.newFooter{ position: absolute; bottom: 0; width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;} /* 去掉了logo */ -.newFooter{ height: 110px; } +.newFooter{ + max-height: 110px; +} .footercon{border-bottom:1px solid #47494d;} .inner-footernav{width: 560px;margin: 0px auto} .inner-footernav li{float: left;height: 50px;width: 80px;text-align: center}