diff --git a/public/images/educoder/headNavLogo.png b/public/images/educoder/headNavLogo.png index 8df93d54d..436d23490 100644 Binary files a/public/images/educoder/headNavLogo.png and b/public/images/educoder/headNavLogo.png differ diff --git a/public/images/educoder/oldheadNavLogo.png b/public/images/educoder/oldheadNavLogo.png new file mode 100644 index 000000000..8df93d54d Binary files /dev/null and b/public/images/educoder/oldheadNavLogo.png differ diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index ca04aa193..258aa4a4c 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -1,7 +1,10 @@ /*--------------------------首页*/ /*头部导航条样式---2018-03-19--by-cs*/ .newHeader{background: #24292D !important; width:100%; height: 60px !important; 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:12px;float: left;width: 36px} +.newHeader .logoimg{ + margin-top: 16px; + float: left; + width: 97px;} .head-nav{float: left;width: 780px;text-align: center;height: 60px;box-sizing: border-box; min-width: 400px;} .head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;} .head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px} diff --git a/public/react/src/context/TPIContextProvider.js b/public/react/src/context/TPIContextProvider.js index 93e16a1f6..0f2f68a75 100644 --- a/public/react/src/context/TPIContextProvider.js +++ b/public/react/src/context/TPIContextProvider.js @@ -104,6 +104,7 @@ class TPIContextProvider extends Component { showEffectDisplay = (data) => { const dom = document.getElementById('picture_display'); window.$(dom).show(); + ReactDOM.unmountComponentAtNode(dom) ReactDOM.render(, dom); } diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css index 529c7df58..1eb60bee8 100644 --- a/public/react/src/modules/tpm/TPMIndex.css +++ b/public/react/src/modules/tpm/TPMIndex.css @@ -18,7 +18,9 @@ body>.-task-title { /*Header START*/ .newHeader .logoimg { - max-height: 60px; + margin-top: 16px; + float: left; + width: 97px; } .head-right i { font-size: 20px; diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 45aea81be..9ab0a3948 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -1,7 +1,10 @@ /*--------------------------首页*/ /*头部导航条样式---2018-03-19--by-cs*/ .newHeader{background: #24292D !important; width:100%; height: 60px !important; 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:12px;float: left;width: 36px} +.newHeader .logoimg{ + margin-top: 16px; + float: left; + width: 97px;} .head-nav{float: left;width: 780px;text-align: center;height: 60px;box-sizing: border-box; min-width: 400px;} .head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;} .head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}