From 949ee37118ef9cc7a6ad96b452488d091fd3cedb 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, 3 Sep 2019 11:27:39 +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

---
 .../src/modules/user/usersInfo/InfosTopics.js | 24 ++++++++++-------
 .../src/modules/user/usersInfo/usersInfo.css  | 27 +++++++++++++++----
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js
index 2e80608c3..6d9c1838f 100644
--- a/public/react/src/modules/user/usersInfo/InfosTopics.js
+++ b/public/react/src/modules/user/usersInfo/InfosTopics.js
@@ -486,32 +486,36 @@ class InfosTopics extends Component{
 
 										{item.is_public===true?<span className="edu-filter-btn ml15 fl typestyle mt3 topiscfilterbtn">公开</span>:""}
 
-										{types==="personal"&&item.is_public===false?user_id===targetuserid&&user_type!="学生"?<a className="btn colorblue mr25 fr font-16" onClick={()=>this.openTopics(item.id)}>设为公开</a>:"":""}
+
 
 										<div className="cl"></div>
 
 										<p className="color-grey panel-lightgrey mt16 fl">
-											<span className={types==="personal"?"topicswidth300":"topicswidth400"}>
-												 {types==="publicly"?<span className="topsics100 color-grey9">{item.creator_name}</span>:""}
+											<span className={"topicswidth600"}>
+												 {types==="publicly"?<span className="topsics135 color-grey9 mr50">{item.creator_name}</span>:""}
 												 <span className="mr50 color-grey9">{item.quotes_count}  次引用</span>
 												 <span className="mr50 color-grey9">{item.solve_count}  次答题</span>
 											   <span className="mr50 color-grey9">{moment(item.updated_at).fromNow()}</span>
 											</span>
-											{item.course_list_name===null?"":<span className="topicsbtn">{item.course_list_name}</span>}
+											{item.course_list_name===null?"":<span className={"topsicrelative topsicinline"} title={item.course_list_name}>
+												<div className={types==="personal"?"topicsbtn topsicsmax550":"topsicsmax550 topicsbtn"}>{item.course_list_name}</div>
+											</span>}
 										</p>
 
 										<div className="homepagePostSetting homepagePostSettingname topscisright">
 											{types==="personal"?user_id===targetuserid&&user_type!="学生"?
 												<a className="btn colorblue mr25 font-16 fr"
-												 href={category==="normal"?`/banks/normal/${item.id}/edit`:
-															 category==="group"?`/banks/group/${item.id}/edit`:
+													 href={category==="normal"?`/banks/normal/${item.id}/edit`:
+														 category==="group"?`/banks/group/${item.id}/edit`:
 															 category==="poll"?`/banks/poll/${item.id}/edit`:
-															 category==="exercise"?`/banks/exercise/${item.id}/edit`:
-															 category==="gtask"?`/banks/gtask/${item.id}/edit`:
-															 category==="gtopic"?`/banks/gtopic/${item.id}/edit`:""
-												 }
+																 category==="exercise"?`/banks/exercise/${item.id}/edit`:
+																	 category==="gtask"?`/banks/gtask/${item.id}/edit`:
+																		 category==="gtopic"?`/banks/gtopic/${item.id}/edit`:""
+													 }
 												>编辑</a>
 												:"":""}
+											{types==="personal"&&item.is_public===false?user_id===targetuserid&&user_type!="学生"?<a className="btn colorblue mr25 fr font-16" onClick={()=>this.openTopics(item.id)}>设为公开</a>:"":""}
+
 										</div>
 									</div>
 								</div>
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css
index cf1d27019..927b0c70c 100644
--- a/public/react/src/modules/user/usersInfo/usersInfo.css
+++ b/public/react/src/modules/user/usersInfo/usersInfo.css
@@ -348,8 +348,8 @@
     opacity: 1;
     border-radius: 2px;
 }
-.topicswidth400{
-    width: 400px;
+.topicswidth600{
+    mac-width: 600px;
     display: inline-block;
 }
 .topicswidth300{
@@ -366,13 +366,13 @@
 
 .topscisright{
     right: 0px;
-    top: 50px;
+    top: 64px;
     display: block;
     position: absolute;
 }
 
-.topsics100{
-    width: 100px;
+.topsics135{
+    max-width: 135px;
     display: inline-block;
 }
 
@@ -405,4 +405,21 @@
 
 .mb45{
     margin-bottom: 45px!important;
+}
+
+.topsicsmax550{
+    max-width: 550px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    position: absolute;
+    top: -16px;
+}
+
+.topsicrelative{
+    position: relative;
+}
+
+.topsicinline{
+    display: inline-block;
 }
\ No newline at end of file