From fc40112da87a0cab9e9a86b0c4a51de37362d42d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 29 Jul 2019 15:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/public/css/edu-all.css             | 17 +++++++++++++++--
 public/react/public/index.html                  |  2 +-
 public/react/src/modules/home/shixunsHome.js    |  2 +-
 public/react/src/modules/tpm/NewFooter.js       |  3 ++-
 public/react/src/modules/tpm/NewHeader.js       | 12 ++++++++----
 public/react/src/modules/tpm/TPMIndex.css       |  4 ++++
 .../react/src/modules/user/Notcompletedysl.js   |  2 +-
 public/stylesheets/educoder/edu-all.css         | 17 +++++++++++++++--
 8 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css
index a9e24da3d..4eeb5497c 100644
--- a/public/react/public/css/edu-all.css
+++ b/public/react/public/css/edu-all.css
@@ -1,11 +1,24 @@
 /*--------------------------首页*/
 /*头部导航条样式---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{
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    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: 16px;
     float: left;
     width: 97px;}
-.head-nav{float: left;width: 830px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
+.head-nav{
+    text-align: center;
+    height: 60px;
+    box-sizing: border-box;
+    min-width: 1000px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 .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}
diff --git a/public/react/public/index.html b/public/react/public/index.html
index a4a795941..318268610 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -87,7 +87,7 @@
     </noscript>
 	<!--用于markdown转html -->
     <div id="md_div" style="display: none;"></div>
-    <div id="root" class="page -layout-v -fit" >
+    <div id="root" class="page -layout-v -fit widthunit" style="min-width: 1535px;">
       <!--<div class="d2-home">-->
         <!--<div class="d2-home__main">-->
           <!--&lt;!&ndash;<img  class="d2-home__loading"&ndash;&gt;-->
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 003724ede..65284d0f8 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -123,7 +123,7 @@ class ShixunsHome extends Component {
 									<Spin spinning={hometypepvisible}  size="large" style={{marginTop:'15%'}}>
                     {/*懒加载*/}
 
-                        <SiderBar/>
+                        {/*<SiderBar/>*/}
                         <div className="clearfix">
                              <div className="clearfix edu-back-white pb40 pt30 mb20" id="index-top" onMouseMove={this.bannaronmousemove} onMouseOut={this.bannaronmouseout}>
                                 <div className="educontent pr educontentSlider">
diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js
index 7f8cd502c..a85b35ccf 100644
--- a/public/react/src/modules/tpm/NewFooter.js
+++ b/public/react/src/modules/tpm/NewFooter.js
@@ -16,7 +16,8 @@ class NewFooter extends Component {
 
   render() {
     return (
-      <div className="newFooter edu-txt-center newContainers">
+      <div className="newFooter edu-txt-center ">
+				{/*newContainers*/}
         <div className="inner-footer_con">
           <div className="footercon">
             {/* <div className="inline mt40 mb5">
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index d197bc9c4..6b435b619 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -649,9 +649,11 @@ submittojoinclass=(value)=>{
 					{...this.state}
 					{...this.props}
 				/>:""}
-				<a href="/" className={" fl"}>
+				<a href="/" className={"fl mr30 ml10"}>
 					<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
 				</a>
+
+
 				<div className="educontent">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
 
@@ -770,6 +772,8 @@ submittojoinclass=(value)=>{
             </div>
 
           </div>
+				</div>
+
 
           {/*<span className="font-15 fr mt17">
 			      	<%= link_to '登录', signin_path, :className => "mr5" %>
@@ -786,7 +790,7 @@ submittojoinclass=(value)=>{
                 <em className="vertical-line"></em>
                 <a href={"/register"} className="mr5 color-white">注册</a>
             </span>:
-            <div className="fr edu-menu-panel" style={{height:'60px'}}>
+            <div className="fr edu-menu-panel mr10" style={{height:'60px'}}>
               <a href={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`} className="fl ml15">
                 <img alt="头像" className="radius mt13" height="34" id="nh_user_logo" name="avatar_image"
                      src={getImageUrl(`images/`+user.image_url)} width="34">
@@ -814,7 +818,7 @@ submittojoinclass=(value)=>{
             </div>
          }
           {/*href="https://www.educoder.net/login"*/}
-         <div className="fr head-right ">
+         <div className="fr head-right">
             {/*{ loadHeader()}*/}
 					 {showSearchOpentype===true?"":<a id="search-open" className="fl mr30 headIcon" onClick={(e)=>this.showSearchOpen(e)}>
               {/*"/images/educoder/icon/search.svg"
@@ -949,7 +953,7 @@ submittojoinclass=(value)=>{
             </Modal>
 
           </div>
-        </div>
+
       </div>
 
     );
diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css
index 1eb60bee8..0e2720b01 100644
--- a/public/react/src/modules/tpm/TPMIndex.css
+++ b/public/react/src/modules/tpm/TPMIndex.css
@@ -200,4 +200,8 @@ body>.-task-title {
 
 .HeaderSearch{
     width: 325px;
+}
+.mainheighs{
+ height: 100%;
+ display: block;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/user/Notcompletedysl.js b/public/react/src/modules/user/Notcompletedysl.js
index e50d162a6..53d9b3509 100644
--- a/public/react/src/modules/user/Notcompletedysl.js
+++ b/public/react/src/modules/user/Notcompletedysl.js
@@ -52,7 +52,7 @@ class Notcompletedysl extends Component {
 
 
 	render() {
-		console.log(this.props)
+		// console.log(this.props)
 		return(
 			<Modal
 				keyboard={false}
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index c5831dad4..5ab2dc0ad 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -1,11 +1,24 @@
 /*--------------------------首页*/
 /*头部导航条样式---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{
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    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: 16px;
     float: left;
     width: 97px;}
-.head-nav{float: left;width:830px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
+.head-nav{
+    text-align: center;
+    height: 60px;
+    box-sizing: border-box;
+    min-width: 1000px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 .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}