From e020ad3c393901fd3e2a163c96209b97afe4fbc3 Mon Sep 17 00:00:00 2001
From: "zorro.zhang" <zorro.zhang@bambulab.com>
Date: Tue, 29 Nov 2022 15:32:42 +0800
Subject: [PATCH] ENH: fix some color problem

Change-Id: Iaae11323cfab96b05746208b8c31b20f3ab56fba
(cherry picked from commit dbe62188c877afdecc522534a2f85f7a0ea80ef4)
---
 resources/web/data/text.js          |  6 +--
 resources/web/homepage/css/dark.css | 27 +++++++++-
 resources/web/homepage/css/home.css | 21 +++++---
 resources/web/homepage/index.html   | 84 +++++++++++++++--------------
 resources/web/homepage/js/home.js   |  2 +-
 5 files changed, 88 insertions(+), 52 deletions(-)

diff --git a/resources/web/data/text.js b/resources/web/data/text.js
index d18dba702c..e7bd49c218 100644
--- a/resources/web/data/text.js
+++ b/resources/web/data/text.js
@@ -30,9 +30,9 @@ var LangText={
 		"t28":"Recent",
 		"t29":"Mall",
 		"t30":"Manual",
-		"t31":"New project",
+		"t31":"New Project",
 		"t32":"Create new project",
-		"t33":"Open project",
+		"t33":"Open Project",
 		"t34":"hotspot",
 		"t35":"Recently opened",
 		"t36":"ok",
@@ -83,7 +83,7 @@ var LangText={
 		"t88":"Remove",
 		"t89":"Open Containing Folder",
 		"t90":"3D Model",
-		"t91":"Download 3D Models"
+		"t91":"Download 3D models"
 	},
 	"zh_CN":{
 		"t1":"欢迎使用Bambu Studio",
diff --git a/resources/web/homepage/css/dark.css b/resources/web/homepage/css/dark.css
index 1022584b2d..1b88d49a0e 100644
--- a/resources/web/homepage/css/dark.css
+++ b/resources/web/homepage/css/dark.css
@@ -1,11 +1,11 @@
 body
 {
-	background-color:#242428;
+	background-color:#2D2D31;
 }
 
 *
 {
-	border-color: #3E3E45;
+	border-color: #6f6f6f;
 }
 
 
@@ -35,12 +35,22 @@ body
 	background-color: #243E30;
 }
 
+.BtnItem:hover .LeftIcon
+{
+	filter: brightness(300%);
+}
+
 .BtnItemSelected
 {
 	color: #fff;
 	background-color: #243E30;
 }
 
+.BtnItemSelected .LeftIcon
+{
+	filter: brightness(300%);
+}
+
 /*-----Right Top MenuBtn-----*/
 .MenuItem:hover
 {
@@ -48,6 +58,19 @@ body
 	background-color: #243E30;
 }
 
+#RecentClearAllBtn:hover
+{
+	color: #000;
+}
+
+#recnet_context_menu
+{
+	color: #fff;
+	background-color:#242428;
+	border: 0px;
+	box-shadow: 0px 0px 3px #DCDCDC;
+}
+
 /*----User Manual------*/
 .UG_DESC
 {
diff --git a/resources/web/homepage/css/home.css b/resources/web/homepage/css/home.css
index 5cbb290aa9..5a9846e88a 100644
--- a/resources/web/homepage/css/home.css
+++ b/resources/web/homepage/css/home.css
@@ -297,14 +297,14 @@ body
 
 #RecentClearAllBtn
 {
-	border: 1px solid #000;
+	border-width: 1px;
+	border-style: solid;
 	padding: 0px 10px;
 	border-radius: 6px;
 	line-height: 26px;
 	height: 26px;
 	margin-left: 20px;
 	cursor: pointer;
-	color: #000;
 	display: none;
 }
 
@@ -365,6 +365,14 @@ body
 	display: inline-block;
 }
 
+.FileName
+{
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;	
+}
+
 .FileDate
 {
 	color: #A8A8A8;
@@ -377,8 +385,8 @@ body
 	padding: 10px;
 	border: 0px;
 	min-width: 100px;
-    top: 800px;
-	border: 1px solid #C3C3C3;
+	border: 1px solid #D7D7D7;
+    top: 100px;
 	border-radius: 5px;
 	color: #323A3D;
 	background-color: #fff;
@@ -387,18 +395,17 @@ body
 
 .CT_Item
 {
-	padding: 2px 10px;
+	padding: 4px 12px;
 	display: flex;
 	flex-direction: row;
 	align-items: center;
-	border: 2px solid #fff;
-	border-radius: 4px;	
 }
 
 .CT_Item:hover
 {
 	cursor: pointer;
 	background-color: #0078D4;
+	border-radius: 4px;
 	color: #fff;
 }
 
diff --git a/resources/web/homepage/index.html b/resources/web/homepage/index.html
index a8989cba98..6a9411e770 100644
--- a/resources/web/homepage/index.html
+++ b/resources/web/homepage/index.html
@@ -79,75 +79,81 @@
 	<div id="RecentFileArea">
 		<div id="RecentTitleBlock">
 		    <div id="RecentTitle" class="Content-Title trans TextS1" tid="t35">recent open</div>
-			<div id="RecentClearAllBtn" class="trans" tid="t12" onClick="OnDeleteAllRecentFiles()">Clear all</div>
+			<div id="RecentClearAllBtn" class="trans TextS1" tid="t12" onClick="OnDeleteAllRecentFiles()">Clear all</div>
 		</div>
 		<div id="FileList">
 <!--		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
 				<div class="FileImg"><img src="img/d.png"/></div>
-				<a class="TextS1">abcd12334.3mf</a>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem" fpath='d:\model\22.3mf'>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a class="TextS1">abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a class="TextS1">abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a class="TextS1">abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a class="TextS1">abcd12334.3mf</a>
-				<div class="FileDate">2021/12/27 09:22</div>
-			</div>	
-		    <div class="FileItem">
-				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a class="TextS1">abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a class="TextS1">abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a class="TextS1">abcd12334.3mf</a>
-				<div class="FileDate">2021/12/27 09:22</div>
-			</div>	
-		    <div class="FileItem" >
-				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/xxxx.jpg" onerror="this.onerror=null;this.src='img/d.png';"  alt="No Image"  /></div>
-				<a class="TextS1">abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a class="TextS1">abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a class="TextS1">abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
-			</div>	-->			
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<a class="FileTip" title="d:\model\11.3mf"></a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+				<div class="FileDate">2021/12/27 09:22</div>
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<a class="FileTip" title="d:\model\11.3mf"></a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+				<div class="FileDate">2021/12/27 09:22</div>
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<a class="FileTip" title="d:\model\11.3mf"></a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+				<div class="FileDate">2021/12/27 09:22</div>
+			</div>	-->		
 		</div>
 	</div>
 	
diff --git a/resources/web/homepage/js/home.js b/resources/web/homepage/js/home.js
index b62cf3adbb..ff1383a8cc 100644
--- a/resources/web/homepage/js/home.js
+++ b/resources/web/homepage/js/home.js
@@ -188,7 +188,7 @@ function ShowRecentFileList( pList )
 		let TmpHtml='<div class="FileItem"  fpath="'+sPath+'"  >'+
 				'<a class="FileTip" title="'+sPath+'"></a>'+
 				'<div class="FileImg" ><img src="'+sImg+'" onerror="this.onerror=null;this.src=\'img/d.png\';"  alt="No Image"  /></div>'+
-				'<a class="TextS1">'+sName+'</a>'+
+				'<div class="FileName TextS1">'+sName+'</div>'+
 				'<div class="FileDate">'+sTime+'</div>'+
 			    '</div>';