From 9cf10abd89bd3b7f1cf1d56ac974a5a6c22deef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 15 Oct 2019 18:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/Resource/Fileslistitem.js | 2 +-
 public/react/src/modules/login/LoginDialog.css             | 7 ++++++-
 public/react/src/modules/login/LoginDialog.js              | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 9d15062a6..2610656cc 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -329,7 +329,7 @@ class Fileslistitem extends Component{
                            { discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
                         </span>
                       </span>
-											{discussMessage&&discussMessage.category_name===null?"":this.props.child===false?<div className="color-grey9 task-hide fr mr50" title={discussMessage&&discussMessage.category_name}
+											{discussMessage&&discussMessage.category_name===null?"":this.props.child===false?<div className="color-grey9 task-hide fr mr60" title={discussMessage&&discussMessage.category_name}
 													 style={{"max-width":"268px"}}>所属目录：{discussMessage&&discussMessage.category_name}
 											</div>:""}
 										</p>
diff --git a/public/react/src/modules/login/LoginDialog.css b/public/react/src/modules/login/LoginDialog.css
index d66acc811..1b534c790 100644
--- a/public/react/src/modules/login/LoginDialog.css
+++ b/public/react/src/modules/login/LoginDialog.css
@@ -103,8 +103,13 @@
 }
 
 
-
 #closeIcon{
+    position: absolute;
+    top: -30px;
+    right: -27px;
+    z-index: 100000;
+}
+#logincloseIcon{
     position: absolute;
     top: -100px;
     right: -27px;
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index 552e8765e..6bd6ac41f 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -568,7 +568,7 @@ class LoginDialog extends Component {
 				</style>:""}
 				{isRender===true?
             <div className={dialogBox}>
-                  <div id="closeIcon" onClick={()=>{this.handleDialogClose()}}>
+                  <div id="closeIcon" className={"logincloseIcon"} onClick={()=>{this.handleDialogClose()}}>
                       <i className="iconfont icon-shanchudiao"></i>
                   </div>