muzi
/
macUI
mirror of https://github.com/1099438829/macUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

个别样式调整及小问题修复

This commit is contained in:
muzi 2019-08-24 23:38:35 +08:00
parent 217f101bff
commit bbabd1f170
5 changed files with 78 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/finder/index.html
View File

@ -1,10 +1,8 @@
<html> <!DOCTYPE html>
<html lang="zh-cn">
<head> <head>
<link rel="stylesheet" href="index.css"></head> <link rel="stylesheet" href="index.css">
<script type="text/javascript" src="js/jquery-2.2.4.min.js"></script> </head>
<script type="text/javascript" src="js/jquery.nicescroll.min.js"></script>
<script type="text/javascript" src="js/main.js"></script>
<body> <body>
<div class="finder-wrapper" id="finder"> <div class="finder-wrapper" id="finder">
<div class="topbar"> <div class="topbar">
@ -28,5 +26,8 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript" src="js/jquery-2.2.4.min.js"></script>
<script type="text/javascript" src="js/jquery.nicescroll.min.js"></script>
<script type="text/javascript" src="js/main.js"></script>
</body> </body>
</html> </html>

2
app/finder/js/main.js
View File

@ -116,7 +116,7 @@ function finderOpenApp(name,path,appObject) {
$.ajax({ $.ajax({
url:'json/openPath.json', url:'json/openPath.json',
type:'GET', // GET type:'GET', // GET
async:false, // 是否异步 async:true, // 是否异步
data:{ data:{
path:path path:path
}, },

122
css/index.css
View File

@ -135,33 +135,20 @@ body {
} }
#win10_btn_group_middle{ #win10_btn_group_middle{
float: left;
overflow: auto; overflow: auto;
display: inline-block; display: inline-block;
} }
#win10_btn_group_middle .btn_close{
position: absolute;
right: 0;
width: 20px;
text-align: center;
color: transparent;
}
#win10_btn_group_middle .btn:hover .btn_close{
color: rgba(131, 168, 157, 0.71);
}
#win10_btn_group_middle .btn:hover .btn_close:hover{
color: white;
}
#win10_btn_group_middle .btn_title{ #win10_btn_group_middle .btn_title{
float: left; /* width: 100%; */
width: 100%;
display: inline-block; display: inline-block;
padding-left: 5px; padding-left: 3.5px;
padding-right: 5px; padding-right: 3.5px;
text-overflow: ellipsis; text-align: center;
margin: 0 auto;
text-overflow: clip;
overflow: hidden; overflow: hidden;
text-align: left;
white-space: nowrap; white-space: nowrap;
} }
@ -183,7 +170,7 @@ body {
overflow: auto; overflow: auto;
} }
#win10_btn_group_left .btn { #win10_btn_group_left .btn,#win10_btn_group_middle .btn{
height: 100%; height: 100%;
width: 35px; width: 35px;
overflow: hidden; overflow: hidden;
@ -240,10 +227,6 @@ body {
background-color: #6a6a6a; background-color: #6a6a6a;
} }
#win10-menu .list::-webkit-scrollbar-button ,#win10_command_center::-webkit-scrollbar-button {
/*background-color: #6a6a6a;*/
}
#win10-menu .list{ #win10-menu .list{
float: left; float: left;
width: 180px; width: 180px;
@ -494,11 +477,6 @@ body {
font-size: 30px; font-size: 30px;
} }
#win10_command_center .command-body .command-body-calendar .lunar-date {
}
#win10_command_center .command-body .notice { #win10_command_center .command-body .notice {
width: 100%; width: 100%;
margin: 5px 0; margin: 5px 0;
@ -666,7 +644,6 @@ body {
font-size: 15px; font-size: 15px;
display: inline-block; display: inline-block;
text-align: right; text-align: right;
float: right;
} }
#win10_command_center .msgs .msg>.btn_close_msg:hover{ #win10_command_center .msgs .msg>.btn_close_msg:hover{
@ -679,21 +656,6 @@ body {
padding-bottom: 5px; padding-bottom: 5px;
} }
#win10_btn_group_middle .btn{
float: left;
box-sizing: border-box;
height: inherit;
max-width: 140px;
line-height: 40px;
color: white;
text-align: center;
font-size: 12px;
word-break: keep-all;
padding: 0 10px;
margin-right: 1px;
position: relative;
}
#win10_btn_group_middle .btn.active{ #win10_btn_group_middle .btn.active{
background: rgba(255,255,255,0.6); background: rgba(255,255,255,0.6);
} }
@ -922,13 +884,11 @@ body {
display: inline-block; display: inline-block;
border-radius: 3px; border-radius: 3px;
text-align: center; text-align: center;
margin-right: 0.5em;
} }
.win10-open-iframe .layui-layer-title img.icon,#win10_btn_group_middle .btn_title img.icon{ .win10-open-iframe .layui-layer-title img.icon,#win10_btn_group_middle .btn_title img.icon{
width: 20px; width: 20px;
position: relative; position: relative;
top:5px ; top:4px ;
margin-right: 0.5em;
} }
#win10-menu>.list>.sub-item img.icon,#win10-menu>.list>.item img.icon{ #win10-menu>.list>.sub-item img.icon,#win10-menu>.list>.item img.icon{
@ -936,7 +896,6 @@ body {
height:36px; height:36px;
position: relative; position: relative;
top:2px ; top:2px ;
margin-right: 0.5em;
} }
/*桌面舞台样式*/ /*桌面舞台样式*/
@ -969,8 +928,6 @@ body {
-webkit-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8); -webkit-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
-moz-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8); -moz-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8); box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8);
-webkit-border-top-left-radius: 5px 5px 0 0;
-webkit-border-top-right-radius: 5px 5px 0 0;
z-index: 100; z-index: 100;
} }
@media \0screen\,screen\9 {/* 只支持IE6、7、8 */ @media \0screen\,screen\9 {/* 只支持IE6、7、8 */
@ -1003,8 +960,13 @@ body {
float: left; float: left;
width: 60px; width: 60px;
margin: 5px auto; margin: 5px auto;
/*过渡的时间 效果*/ outline: none;
-webkit-transition: 0.15s linear; cursor: pointer;
}
#footer .dock ul li:focus{
-webkit-animation: bounce 1s;
animation: bounce 1s;
} }
#footer .dock .dock-tips{ #footer .dock .dock-tips{
@ -1136,9 +1098,6 @@ body {
} }
@media (min-width: 1281px) { @media (min-width: 1281px) {
//CSS
} }
/* /*
@ -1147,9 +1106,6 @@ body {
*/ */
@media (min-width: 1025px) and (max-width: 1280px) { @media (min-width: 1025px) and (max-width: 1280px) {
} }
/* /*
@ -1224,3 +1180,49 @@ body {
width: calc(100% - 20px); width: calc(100% - 20px);
} }
} }
@-webkit-keyframes bounce {
0% {
-webkit-transform: translateY(0px) translateX(0.1px);
transform: translateY(0px) translateX(0.1px);
}
25% {
-webkit-transform: translateY(-40px) translateX(0.1px);
transform: translateY(-40px) translateX(0.1px);
}
50% {
-webkit-transform: translateY(0px) translateX(0.1px);
transform: translateY(0px) translateX(0.1px);
}
75% {
-webkit-transform: translateY(-20px) translateX(0.1px);
transform: translateY(-20px) translateX(0.1px);
}
100% {
-webkit-transform: translateY(0px) translateX(0.1px);
transform: translateY(0px) translateX(0.1px);
}
}
@keyframes bounce {
0% {
-webkit-transform: translateY(0px) translateX(0.1px);
transform: translateY(0px) translateX(0.1px);
}
25% {
-webkit-transform: translateY(-40px) translateX(0.1px);
transform: translateY(-40px) translateX(0.1px);
}
50% {
-webkit-transform: translateY(0px) translateX(0.1px);
transform: translateY(0px) translateX(0.1px);
}
75% {
-webkit-transform: translateY(-20px) translateX(0.1px);
transform: translateY(-20px) translateX(0.1px);
}
100% {
-webkit-transform: translateY(0px) translateX(0.1px);
transform: translateY(0px) translateX(0.1px);
}
}

6
index.html
View File

@ -6,13 +6,13 @@
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/> <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
<title>macOS</title> <title>macOS</title>
<link rel='Shortcut Icon' type='image/x-icon' href='./img/favicon.ico'> <link rel='Shortcut Icon' type='image/x-icon' href='./img/favicon.ico'>
<script type="text/javascript" src="./js/jquery-2.2.4.min.js"></script>
<link href="./css/animate.css" rel="stylesheet"> <link href="./css/animate.css" rel="stylesheet">
<link rel="stylesheet" href="./component/font-awesome-4.7.0/css/font-awesome.min.css"> <link href="./component/font-awesome-4.7.0/css/font-awesome.min.css" rel="stylesheet">
<link href="./css/index.css" rel="stylesheet"> <link href="./css/index.css" rel="stylesheet">
<link rel="stylesheet" href="./plugins/shortcut-drawer/shortcut-drawer.min.css">
<script type="text/javascript" src="./js/jquery-2.2.4.min.js"></script>
<script type="text/javascript" src="./component/layer-v3.1.1/layer/layer.js"></script> <script type="text/javascript" src="./component/layer-v3.1.1/layer/layer.js"></script>
<script type="text/javascript" src="./js/mac.js"></script> <script type="text/javascript" src="./js/mac.js"></script>
<link rel="stylesheet" href="./plugins/shortcut-drawer/shortcut-drawer.min.css">
<script type="text/javascript" src="./plugins/shortcut-drawer/shortcut-drawer.min.js"></script> <script type="text/javascript" src="./plugins/shortcut-drawer/shortcut-drawer.min.js"></script>
<script> <script>
Win10.onReady(function () { Win10.onReady(function () {

18
js/mac.js
View File

@ -53,12 +53,6 @@ window.Win10 = {
} }
}, },
_iframe_click_lock_children:{}, _iframe_click_lock_children:{},
_renderBar:function () {
//调整任务栏项目的宽度
if(this._countTask<=0){return;} //防止除以0
var btns=$("#win10_btn_group_middle>.btn");
btns.css('width',('calc('+(1/this._countTask*100)+'% - 1px )'))
},
_handleReady:[], _handleReady:[],
_hideShortcut:function () { _hideShortcut:function () {
var that=$("#win10 #win10-shortcuts .shortcut"); var that=$("#win10 #win10-shortcuts .shortcut");
@ -221,7 +215,6 @@ window.Win10 = {
layer.close(index); layer.close(index);
Win10._checkTop(); Win10._checkTop();
Win10._countTask--;//回退countTask数 Win10._countTask--;//回退countTask数
Win10._renderBar();
}, },
_fixWindowsHeightAndWidth:function(){ _fixWindowsHeightAndWidth:function(){
//此处代码修正全屏切换引起的子窗体尺寸超出屏幕 //此处代码修正全屏切换引起的子窗体尺寸超出屏幕
@ -390,8 +383,8 @@ window.Win10 = {
} }
}); });
$("#win10-btn-browser").click(function () { $("#win10-btn-browser").click(function () {
// var area = ['100%', (document.body.clientHeight - 40) + 'px']; var area = ['100%', (document.body.clientHeight - 30) + 'px'];
// var offset = ['0', '0']; var offset = ['0', '0'];
layer.prompt({ layer.prompt({
title: Win10.lang('访问网址','Visit URL'), title: Win10.lang('访问网址','Visit URL'),
formType: 2, formType: 2,
@ -807,7 +800,7 @@ window.Win10 = {
} }
}); });
}, },
//渲染DOCK //渲染DOCK
renderDocks:function () { renderDocks:function () {
var cell_width=60; var cell_width=60;
var width=document.body.clientWidth ; var width=document.body.clientWidth ;
@ -973,7 +966,6 @@ window.Win10 = {
$("#win10_" + index).remove(); $("#win10_" + index).remove();
Win10._checkTop(); Win10._checkTop();
Win10._countTask--;//回退countTask数 Win10._countTask--;//回退countTask数
Win10._renderBar();
}, },
min: function (layero) { min: function (layero) {
layero.hide(); layero.hide();
@ -987,7 +979,7 @@ window.Win10 = {
}, },
}); });
$('#win10_btn_group_middle .btn.active').removeClass('active'); $('#win10_btn_group_middle .btn.active').removeClass('active');
var btn = $('<div id="win10_' + index + '" index="' + index + '" class="btn show active"><div class="btn_title">'+icon+'</div><div class="btn_close fa fa-close"></div></div>'); var btn = $('<div id="win10_' + index + '" index="' + index + '" class="btn show active"><div class="btn_title">'+icon+'</div></div>');
var layero_opened=Win10.getLayeroByIndex(index); var layero_opened=Win10.getLayeroByIndex(index);
layero_opened.css('z-index',Win10._countTask+813); layero_opened.css('z-index',Win10._countTask+813);
Win10._settop(layero_opened); Win10._settop(layero_opened);
@ -1010,7 +1002,6 @@ window.Win10 = {
}); });
$("#win10_btn_group_middle").append(btn); $("#win10_btn_group_middle").append(btn);
Win10._renderBar();
btn.click(function () { btn.click(function () {
var index = $(this).attr('index'); var index = $(this).attr('index');
var layero = Win10.getLayeroByIndex(index); var layero = Win10.getLayeroByIndex(index);
@ -1062,7 +1053,6 @@ window.Win10 = {
$(".win10-open-iframe").remove(); $(".win10-open-iframe").remove();
$("#win10_btn_group_middle").html(""); $("#win10_btn_group_middle").html("");
Win10._countTask = 0; Win10._countTask = 0;
Win10._renderBar();
}, },
setAnimated:function (animated_classes,animated_liveness) { setAnimated:function (animated_classes,animated_liveness) {
this._animated_classes=animated_classes; this._animated_classes=animated_classes;