Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

# Conflicts: # public/update.html
5 years ago · eacd3be6c6
parent 758087a5ba
commit eacd3be6c6
4 changed files with 8 additions and 1 deletions
--- a/public/images/educoder/headNavLogo.png
+++ b/public/images/educoder/headNavLogo.png
--- a/public/images/educoder/headNavLogo1.png
+++ b/public/images/educoder/headNavLogo1.png
--- a/public/react/src/modules/tpm/TPMIndex.css
+++ b/public/react/src/modules/tpm/TPMIndex.css
@ -17,6 +17,9 @@ body>.-task-title {

 /*Header START*/
 .newHeader .logoimg {
+	margin-top: 16px;
+	float: left;
+	width: 97px;
 	max-height: 60px;
 }
 .head-right i {
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@ -1,7 +1,11 @@
 /*--------------------------首页*/
 /*头部导航条样式---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 .logoimg{margin-top:12px;float: left;width: 36px}
+.newHeader .logoimg{
+    margin-top: 16px;
+    float: left;
+    width: 97px;
+}
 .head-nav{float: left;width: 920px;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}