From b75ebe1a2442564dfeda90a2318e33933e93e06a 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, 27 Jul 2019 17:40:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb |  8 +++++---
 app/views/layouts/_unlogin_header.html.erb |  9 ++++++---
 public/react/src/modules/tpm/NewHeader.js  | 23 ++++++++++++++++------
 public/stylesheets/educoder/edu-all.css    |  4 ++--
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 5089fb28..3e01f7cb 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -1,7 +1,9 @@
-<div class="educontent clearfix">
-  <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg"), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg ml20 fl"), home_path %>
+<div class="educontent">
+
   <div class="head-nav pr">
     <ul id="header-nav">
+      <li class="<%= params[:controller] == "welcome" ? 'active' : '' %>"><%= link_to "首页", home_path %></li>
       <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
       <!-- 精选实训 -->
@@ -70,7 +72,7 @@
       <li class="bor-top-greyE"><%= link_to '退出', signout_path %></li>
     </ul>
   </div>
-  <div class="fr head-right">
+  <div class="fr head-right mr10">
     <a href="javascript:void(0)" id="search-open" class="fl headIcon pointer">
       <i class="iconfont icon-sousuo color-white"></i>
     </a>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 17b5ea12..d17c2744 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,8 +1,11 @@
-<div class="educontent clearfix">
-  <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg"), home_path %>
+
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg ml20 fl"), home_path %>
+
+<div class="educontent">
+
   <div class="head-nav pr">
     <ul id="header-nav">
-      <li class="active" style="display: none"><%= link_to "首页", home_path %></li>
+      <li class="<%= params[:controller] == "welcome" ? 'active' : '' %>"><%= link_to "首页", home_path %></li>
       <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
 
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index b62ab515..d5e601b8 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -352,15 +352,17 @@ class NewHeader extends Component {
 							</div>
 						</div>
 					</Modal>
-          	<div className="educontent clearfix">
+					<a href="/" className={"ml20 fl"}>
+						{ImageUrlType===true?<img alt="高校智能化教学与实训平台" className="fl" src={getImageUrl(ImageUrl)} style={{height:'60px'}} />:<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(ImageUrl)}/>}
+					</a>
+          	<div className="educontent">
 			  	{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
-			  	<a href="/">
-            {ImageUrlType===true?<img alt="高校智能化教学与实训平台" className="fl" src={getImageUrl(ImageUrl)} style={{height:'60px'}} />:<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(ImageUrl)}/>}
-			  	</a>
+
 			  	<div className="head-nav pr">
 
                     <ul id="header-nav">
                         {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
+											  <li><a href="/">首页</a></li>
                         <li><a href="/paths">实践课程</a></li>
                         <li><a href="/courses">翻转课堂</a></li>
 
@@ -399,7 +401,16 @@ class NewHeader extends Component {
                         <li className={`${activeForums === true ? 'active' : ''}`}><a href="/forums">交流问答</a></li>
                         <li className={`${activeCourses === true ? 'active' : ''}`} style={{display:ecUrl===null||ecUrl===undefined||ecUrl===""?'none':'block'}}><a href={ecUrl}>{ecUrl===null||ecUrl===undefined||ecUrl===""?'':'工程认证'}</a></li>
                     </ul>
-				    <div className="posi-search" id="posi-search" style={{display: 'none'}}>
+						<style>
+							{
+								`
+								.mar55{
+									margin-right: 55px;
+								}
+								`
+							}
+						</style>
+				    <div className="posi-search mar55" id="posi-search" style={{display: 'none'}}>
 				        <div className="search-all clearfix">
 				          {/*<!--<a href="javascript:void(0)" className="search-clear fl" onclick="closeSearch();">×</a>-->*/}
 				          	<div className="fl pr search-clear edu-menu-panel" style={{display: 'none'}}>
@@ -464,7 +475,7 @@ class NewHeader extends Component {
                 </div>
 
 
-			  	<div className="fr head-right">
+			  	<div className="fr head-right mr10">
 				    <a href="javascript:void(0)" id="search-open" className="fl mr30 headIcon">
 				    	{/*"/images/educoder/icon/search.svg"
                              <img src={getImageUrl(`images/educoder/icon/search.svg`)} /> */}
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index fda0c4b2..f9714ee6 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -6,8 +6,8 @@
     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{float: left;width: 915px;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;}
 .head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}
 .head-nav ul#header-nav li a{display: block;height: 100%;width: 100%;color: #fff}
 .head-nav ul#header-nav li a:hover{color: #cccccc;}

From 2c39e2189858dfdd05f347ed0cdb131eca806cac 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, 27 Jul 2019 17:46:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 3 ++-
 app/views/layouts/_unlogin_header.html.erb | 4 ++--
 public/stylesheets/educoder/edu-all.css    | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 3e01f7cb..60b5c008 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -33,7 +33,8 @@
         </li>
       <% end %>
     </ul>
-    <div class="posi-search" id="posi-search" style="display: none">
+    <div class="posi-search mrf40" id="posi-search" style="
+    display: none">
       <div class="search-all clearfix">
         <div class="fl pr search-clear edu-menu-panel" style="display: none">
           <input type="hidden" id="search_type" value="1">
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index d17c2744..064adb96 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -31,7 +31,7 @@
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li>
       <!--<li><%#= link_to "活动竞赛", competitions_path %></li>-->
     </ul>
-    <div class="posi-search unlogin" id="posi-search" style="display: none" >
+    <div class="posi-search unlogin mrf40" id="posi-search" style="display: none" >
       <div class="search-all clearfix">
         <!--<a href="javascript:void(0)" class="search-clear fl" onclick="closeSearch();">×</a>-->
         <div class="fl pr search-clear edu-menu-panel" style="display: none">
@@ -59,7 +59,7 @@
     <a href="/register" class="mr5 color-white">注册</a>
     <%#= link_to '注册', user_join_path, :class => "ml5 color-white" %>
     </span>
-  <div class="fr head-right">
+  <div class="fr head-right mr10">
     <a href="javascript:void(0)" id="search-open" class="fl headIcon">
       <i class="iconfont icon-sousuo color-white"></i>
     </a>
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index f9714ee6..0eafefc0 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -3530,4 +3530,8 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
 .vertical4{
     vertical-align: -4px;
     margin-right: 0px !important;
+}
+
+.mrf40{
+     margin-right: -40px;
 }
\ No newline at end of file