3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-16 11:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ENH: fix some color problem

Browse source 
Change-Id: Iaae11323cfab96b05746208b8c31b20f3ab56fba
(cherry picked from commit dbe62188c877afdecc522534a2f85f7a0ea80ef4)
This commit is contained in:
zorro.zhang 2022-11-29 15:32:42 +08:00 • committed by Lane.Wei
parent e217baad50
commit e020ad3c39
5 changed files with 88 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/web/data/text.js
View file

@ -30,9 +30,9 @@ var LangText={
"t28":"Recent", "t28":"Recent",
"t29":"Mall", "t29":"Mall",
"t30":"Manual", "t30":"Manual",
"t31":"New project", "t31":"New Project",
"t32":"Create new project", "t32":"Create new project",
"t33":"Open project", "t33":"Open Project",
"t34":"hotspot", "t34":"hotspot",
"t35":"Recently opened", "t35":"Recently opened",
"t36":"ok", "t36":"ok",
@ -83,7 +83,7 @@ var LangText={
"t88":"Remove", "t88":"Remove",
"t89":"Open Containing Folder", "t89":"Open Containing Folder",
"t90":"3D Model", "t90":"3D Model",
"t91":"Download 3D Models" "t91":"Download 3D models"
}, },
"zh_CN":{ "zh_CN":{
"t1":"欢迎使用Bambu Studio", "t1":"欢迎使用Bambu Studio",

27
resources/web/homepage/css/dark.css
View file

@ -1,11 +1,11 @@
body body
{ {
background-color:#242428; background-color:#2D2D31;
} }
* *
{ {
border-color: #3E3E45; border-color: #6f6f6f;
} }
@ -35,12 +35,22 @@ body
background-color: #243E30; background-color: #243E30;
} }
.BtnItem:hover .LeftIcon
{
filter: brightness(300%);
}
.BtnItemSelected .BtnItemSelected
{ {
color: #fff; color: #fff;
background-color: #243E30; background-color: #243E30;
} }
.BtnItemSelected .LeftIcon
{
filter: brightness(300%);
}
/*-----Right Top MenuBtn-----*/ /*-----Right Top MenuBtn-----*/
.MenuItem:hover .MenuItem:hover
{ {
@ -48,6 +58,19 @@ body
background-color: #243E30; 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------*/ /*----User Manual------*/
.UG_DESC .UG_DESC
{ {

21
resources/web/homepage/css/home.css
View file

@ -297,14 +297,14 @@ body
#RecentClearAllBtn #RecentClearAllBtn
{ {
border: 1px solid #000; border-width: 1px;
border-style: solid;
padding: 0px 10px; padding: 0px 10px;
border-radius: 6px; border-radius: 6px;
line-height: 26px; line-height: 26px;
height: 26px; height: 26px;
margin-left: 20px; margin-left: 20px;
cursor: pointer; cursor: pointer;
color: #000;
display: none; display: none;
} }
@ -365,6 +365,14 @@ body
display: inline-block; display: inline-block;
} }
.FileName
{
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
}
.FileDate .FileDate
{ {
color: #A8A8A8; color: #A8A8A8;
@ -377,8 +385,8 @@ body
padding: 10px; padding: 10px;
border: 0px; border: 0px;
min-width: 100px; min-width: 100px;
top: 800px; border: 1px solid #D7D7D7;
border: 1px solid #C3C3C3; top: 100px;
border-radius: 5px; border-radius: 5px;
color: #323A3D; color: #323A3D;
background-color: #fff; background-color: #fff;
@ -387,18 +395,17 @@ body
.CT_Item .CT_Item
{ {
padding: 2px 10px; padding: 4px 12px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
border: 2px solid #fff;
border-radius: 4px;
} }
.CT_Item:hover .CT_Item:hover
{ {
cursor: pointer; cursor: pointer;
background-color: #0078D4; background-color: #0078D4;
border-radius: 4px;
color: #fff; color: #fff;
} }

70
resources/web/homepage/index.html
View file

@ -79,73 +79,79 @@
<div id="RecentFileArea"> <div id="RecentFileArea">
<div id="RecentTitleBlock"> <div id="RecentTitleBlock">
<div id="RecentTitle" class="Content-Title trans TextS1" tid="t35">recent open</div> <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>
<div id="FileList"> <div id="FileList">
<!-- <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'> <!-- <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
<a class="FileTip" title="d:\model\11.3mf"></a> <a class="FileTip" title="d:\model\11.3mf"></a>
<div class="FileImg"><img src="img/d.png"/></div> <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 class="FileDate">2021/12/27 09:22</div>
</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> <a class="FileTip" title="d:\model\11.3mf"></a>
<div class="FileImg"><img src="img/b.jpg"/></div> <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 class="FileDate">2021/12/27 09:22</div>
</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> <a class="FileTip" title="d:\model\11.3mf"></a>
<div class="FileImg"><img src="img/b.jpg"/></div> <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 class="FileDate">2021/12/27 09:22</div>
</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> <a class="FileTip" title="d:\model\11.3mf"></a>
<div class="FileImg"><img src="img/b.jpg"/></div> <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 class="FileDate">2021/12/27 09:22</div>
</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> <a class="FileTip" title="d:\model\11.3mf"></a>
<div class="FileImg"><img src="img/b.jpg"/></div> <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 class="FileDate">2021/12/27 09:22</div>
</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> <a class="FileTip" title="d:\model\11.3mf"></a>
<div class="FileImg"><img src="img/b.jpg"/></div> <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 class="FileDate">2021/12/27 09:22</div>
</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> <a class="FileTip" title="d:\model\11.3mf"></a>
<div class="FileImg"><img src="img/b.jpg"/></div> <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 class="FileDate">2021/12/27 09:22</div>
</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> <a class="FileTip" title="d:\model\11.3mf"></a>
<div class="FileImg"><img src="img/b.jpg"/></div> <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 class="FileDate">2021/12/27 09:22</div>
</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> <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> <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 class="FileDate">2021/12/27 09:22</div>
</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> <a class="FileTip" title="d:\model\11.3mf"></a>
<div class="FileImg"><img src="img/b.jpg"/></div> <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 class="FileDate">2021/12/27 09:22</div>
</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> <a class="FileTip" title="d:\model\11.3mf"></a>
<div class="FileImg"><img src="img/b.jpg"/></div> <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" 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 class="FileDate">2021/12/27 09:22</div>
</div> --> </div> -->
</div> </div>

2
resources/web/homepage/js/home.js
View file

@ -188,7 +188,7 @@ function ShowRecentFileList( pList )
let TmpHtml='<div class="FileItem" fpath="'+sPath+'" >'+ let TmpHtml='<div class="FileItem" fpath="'+sPath+'" >'+
'<a class="FileTip" title="'+sPath+'"></a>'+ '<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>'+ '<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 class="FileDate">'+sTime+'</div>'+
'</div>'; '</div>';