mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-30 12:11:15 -06:00 
			
		
		
		
	ENH: fix some color problem
Change-Id: Iaae11323cfab96b05746208b8c31b20f3ab56fba (cherry picked from commit dbe62188c877afdecc522534a2f85f7a0ea80ef4)
This commit is contained in:
		
							parent
							
								
									e217baad50
								
							
						
					
					
						commit
						e020ad3c39
					
				
					 5 changed files with 88 additions and 52 deletions
				
			
		|  | @ -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 | ||||
| { | ||||
|  |  | |||
|  | @ -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; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -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> | ||||
| 	 | ||||
|  |  | |||
|  | @ -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>'; | ||||
| 		 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 zorro.zhang
						zorro.zhang