From 2b7246d910b83ad791adc00d1983f49b38f1f5b6 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, 16 Nov 2019 21:39:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4login=20=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/admins/sidebar.scss       | 9 +++++++++
 public/react/src/modules/tpm/NewHeader.js        | 2 +-
 public/react/src/modules/user/Notcompletedysl.js | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/admins/sidebar.scss b/app/assets/stylesheets/admins/sidebar.scss
index db71591ef..d6560f9ae 100644
--- a/app/assets/stylesheets/admins/sidebar.scss
+++ b/app/assets/stylesheets/admins/sidebar.scss
@@ -6,6 +6,15 @@
   transition: all 0.5s;
   overflow-y: scroll;
 
+  .sidebar-header {
+    .sidebar-header-logo {
+      img {
+        max-width: 130px !important;
+        max-height: 40px !important;
+        overflow: hidden;
+        }
+    }
+  }
   &::-webkit-scrollbar {
     display:none
   }
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 4d030a81e..9c5652aaf 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -1232,7 +1232,7 @@ submittojoinclass=(value)=>{
                 </img>
               </a>
               <ul className="edu-menu-list" style={{top:'60px'}}>
-                <span className="bor-bottom-greyE currentName task-hide">{user.username}</span>
+                {/*<span className="bor-bottom-greyE currentName task-hide">{user.username}</span>*/}
 								{coursestypes===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`}>我的课堂</Link></li>}
                 {/* p 老师  l 学生 */}
 								{shixuntype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
diff --git a/public/react/src/modules/user/Notcompletedysl.js b/public/react/src/modules/user/Notcompletedysl.js
index 53d9b3509..63c58d933 100644
--- a/public/react/src/modules/user/Notcompletedysl.js
+++ b/public/react/src/modules/user/Notcompletedysl.js
@@ -67,7 +67,7 @@ class Notcompletedysl extends Component {
 				<div className="educouddiv">
 					<div className={"tabeltext-alignleft"}><p style={{fontSize: "16px"}}>完善您的资料，将获得更多的使用权限</p></div>
 					<div className="clearfix mt30 edu-txt-center">
-						<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
+						<a className="task-btn mr30" onClick={()=>this.modalCancel()}>稍后完善</a>
 						<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>立即完善</a>
 					</div>
 				</div>