diff --git a/public/react/public/css/css_min_all.css b/public/react/public/css/css_min_all.css index e24882ec4..e83105e47 100755 --- a/public/react/public/css/css_min_all.css +++ b/public/react/public/css/css_min_all.css @@ -3,7 +3,7 @@ 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{ position: absolute; bottom: 0; width: 100%; height: 50px;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 425255048..d204fc6e0 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -71,7 +71,7 @@ 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{ position: absolute; bottom: 0; width: 100%; height: 50px;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..4f8992877 100755 --- a/public/react/public/css/edu-common.css +++ b/public/react/public/css/edu-common.css @@ -3,7 +3,7 @@ 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{ position: absolute; bottom: 0; width: 100%; height: 50px;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 6418d71f8..f8501870b 100644 --- a/public/react/src/modules/tpm/NewFooter.js +++ b/public/react/src/modules/tpm/NewFooter.js @@ -17,7 +17,7 @@ class NewFooter extends Component { render() { return ( -
+
{/*newContainers*/}
{/*
*/} diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index 7997c8c8d..d4f94af62 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -3,7 +3,7 @@ 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{ position: absolute; bottom: 0; width: 100%; height: 50px;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 2ac90ee0c..d2181a4f7 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -71,9 +71,9 @@ 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{ position: absolute; bottom: 0; width: 100%; height: 50px;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;} /* 去掉了logo */ -.newFooter{ height: 110px; } +.newFooter{ height: 50px; } .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}