暂存修改这个并不是一个完整的提交

This commit is contained in:
muzi_ys 2022-10-20 00:21:18 +08:00
parent 1d06f4cc84
commit c250b4e3de
16 changed files with 1062 additions and 119 deletions

File diff suppressed because one or more lines are too long

View File

@ -732,111 +732,141 @@ body {
display: none;
}
.mac-open-iframe .layui-layer-min cite {
display: none;
.mac-open-iframe .layui-layer-ico {
background: url(../img/frame/assets.png) no-repeat
}
.mac-open-iframe .layui-layer-max:hover {
background-image: none
.mac-open-iframe .layui-layer-setwin {
position: absolute;
left: 0;
top: 0;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
text-align: center;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
font-size: 0;
height: 30px;
line-height: 30px;
}
.mac-open-iframe .layui-layer-max, .layui-layer-maxmin {
.mac-open-iframe .layui-layer-setwin a {
width: 30px;
height: 30px;
font-size: 13px;
overflow: hidden;
margin-left: 10px;
}
.mac-open-iframe .layui-layer-title {
line-height: 30px;
height: 30px;
}
.mac-open-iframe .layui-layer-title .icon, #mac_btn_group_middle .btn_title .icon {
font-size: 15px;
padding: 1px;
width: 20px;
height: 20px;
line-height: 20px;
display: inline-block;
border-radius: 3px;
text-align: center;
}
.mac-open-iframe .layui-layer-title img.icon, #mac_btn_group_middle .btn_title img.icon {
width: 20px;
position: relative;
}
.mac-open-iframe .layui-layer-title img.icon {
top: 5px;
}
.mac-open-iframe .layui-layer-min cite{display:none}
.mac-open-iframe .layui-layer-max, .layui-layer-maxmin, .layui-layer-min cite {
background: none
}
body .mac-open-iframe .layui-layer-setwin .layui-layer-min {
background-color: #FFBD2E;
border-radius:50%;
width: 0.9rem;
height:0.9rem;
}
body .mac-open-iframe .layui-layer-setwin .layui-layer-min:hover {
background:url("../img/frame/unmaximize.png") no-repeat center;
background-size: 1rem 1rem;
}
.mac-open-iframe .layui-layer-setwin a::before {
display: inline-block;
width: 0.9rem;
height: 0.9rem;
width: 1rem;
height: 1rem;
border-radius: 50%;
}
.mac-open-iframe .layui-layer-setwin a.layui-layer-close1:hover::before {
content: "\f057";
color: #FF6057;
font: normal normal normal 0.9rem/1 FontAwesome;
font: normal normal normal 1rem/1 FontAwesome;
}
.mac-open-iframe .layui-layer-min::before {
content: "\f111";
color: #28CA40;
font: normal normal normal 0.9rem/1 FontAwesome;
body .mac-open-iframe .layui-layer-setwin .layui-layer-max {
background-color:#28CA42;
border-radius:50%;
width: 0.9rem;
height:0.9rem;
}
.mac-open-iframe .layui-layer-min:hover::before {
content: "\f056";
color: #28CA40;
font: normal normal normal 0.9rem/1 FontAwesome;
body .mac-open-iframe .layui-layer-setwin .layui-layer-max:hover {
background:url("../img/frame/unmaximize.png") no-repeat center;
background-size: 1rem 1rem;
}
.mac-open-iframe .layui-layer-max::before {
content: "\f111";
color: #FFBD2E;
font: normal normal normal 0.9rem/1 FontAwesome;
body .mac-open-iframe .layui-layer-setwin .layui-layer-maxmin {
background-color:#28CA42;
border-radius:50%;
width: 0.9rem;
height:0.9rem;
}
.mac-open-iframe .layui-layer-max:hover::before {
content: "\f055";
color: #FFBD2E;
font: normal normal normal 0.9rem/1 FontAwesome;
}
.mac-open-iframe .layui-layer-maxmin.layui-layer-max::before {
content: "\f111";
color: #FFBD2E;
font: normal normal normal 0.9rem/1 FontAwesome;
}
.mac-open-iframe .layui-layer-maxmin.layui-layer-max:hover::before {
content: "\f055";
color: #FFBD2E;
font: normal normal normal 0.9rem/1 FontAwesome;
body .mac-open-iframe.layui-layer-setwin .layui-layer-maxmin:hover {
background:url("../img/frame/maximize.png") no-repeat center;
background-size: 1rem 1rem;
}
.mac-open-iframe .layui-layer-close::before {
content: "\f111";
color: #FF6057;
font: normal normal normal 0.9rem/1 FontAwesome;
font: normal normal normal 1rem/1 FontAwesome;
}
/*
.mac-open-iframe .layui-layer-setwin .layui-layer-max::before{
background-color: #FFBD2E;
}
.mac-open-iframe .layui-layer-min::before{
background-color: #28CA40;
}
.mac-open-iframe .mac-btn-refresh::before{
background-color: #029FFF;
}
.layui-layer-setwin .layui-layer-close1::hover{
content: "xxx";
background-color: #fd6458;
}
*/
.mac-open-iframe .layui-layer-min, .layui-layer-close, .layui-layer-max {
text-decoration: none;
}
.mac-btn-refresh, .mac-btn-change-url, .mac-btn-refresh:hover, .mac-btn-change-url:hover {
.layui-layer-refresh, .layui-layer-change-url, .layui-layer-refresh:hover, .layui-layer-change-url:hover {
text-decoration: none;
}
.mac-open-iframe .mac-btn-refresh::before, .mac-btn-change-url::before {
.mac-open-iframe .layui-layer-refresh::before, .layui-layer-change-url::before {
content: "\f111";
color: #029FFF;
font: normal normal normal 0.9rem/1 FontAwesome;
font: normal normal normal 1rem/1 FontAwesome;
}
.mac-open-iframe .mac-btn-refresh:hover::before, .mac-btn-change-url:hover::before {
.mac-open-iframe .layui-layer-refresh:hover::before, .layui-layer-change-url:hover::before {
content: "\f192";
color: #029FFF;
font: normal normal normal 0.9rem/1 FontAwesome;
font: normal normal normal 1rem/1 FontAwesome;
}
/*右键菜单*/
@ -889,55 +919,6 @@ body {
border-top: none
}
/*块级按钮*/
.mac-open-iframe .layui-layer-ico {
background-image: none;
}
.mac-open-iframe .layui-layer-setwin {
position: absolute;
left: 0;
top: 0;
font-size: 0;
height: 30px;
line-height: 30px;
}
.mac-open-iframe .layui-layer-setwin a {
position: relative;
width: 30px;
height: 30px;
font-size: 13px;
text-align: center;
overflow: hidden;
margin: 0;
}
.mac-open-iframe .layui-layer-title {
line-height: 30px;
height: 30px;
}
.mac-open-iframe .layui-layer-title .icon, #mac_btn_group_middle .btn_title .icon {
font-size: 15px;
padding: 1px;
width: 20px;
height: 20px;
line-height: 20px;
display: inline-block;
border-radius: 3px;
text-align: center;
}
.mac-open-iframe .layui-layer-title img.icon, #mac_btn_group_middle .btn_title img.icon {
width: 20px;
position: relative;
}
.mac-open-iframe .layui-layer-title img.icon {
top: 5px;
}
#mac-menu > .list > .sub-item img.icon, #mac-menu > .list > .item img.icon {
width: 36px;
height: 36px;

View File

@ -8,10 +8,10 @@
<title>mac桌面</title>
<meta name="description" content="mac桌面">
<meta name="keywords" content="mac桌面">
<link rel='Shortcut Icon' type='image/x-icon' href='./img/favicon.ico'>
<link rel='Shortcut Icon' type='image/x-icon' href='./favicon.ico'>
<link rel="stylesheet" href="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/animate.css/4.1.1/animate.min.css">
<link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="./css/index.min.css">
<link rel="stylesheet" href="./css/index.css">
<link rel="stylesheet" href="./plugins/shortcut-drawer/shortcut-drawer.min.css">
</head>

View File

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
img/frame/assets.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

BIN
img/frame/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
img/frame/maximize.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
img/frame/maximize1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
img/frame/unmaximize.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
img/frame/unmaximize1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
img/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -8,10 +8,10 @@
<title>mac桌面</title>
<meta name="description" content="mac桌面">
<meta name="keywords" content="mac桌面">
<link rel='Shortcut Icon' type='image/x-icon' href='./img/favicon.ico'>
<link rel='Shortcut Icon' type='image/x-icon' href='./favicon.ico'>
<link rel="stylesheet" href="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/animate.css/4.1.1/animate.min.css">
<link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="./css/index.min.css">
<link rel="stylesheet" href="./css/index.css">
<link rel="stylesheet" href="./plugins/shortcut-drawer/shortcut-drawer.min.css">
</head>
@ -147,7 +147,7 @@
<script type="text/javascript"
src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/2.2.4/jquery.min.js"></script>
<script type="text/javascript" src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/layer/3.5.1/layer.min.js"></script>
<script type="text/javascript" src="./js/index.min.js"></script>
<script type="text/javascript" src="./js/index.js"></script>
<script type="text/javascript" src="./plugins/shortcut-drawer/shortcut-drawer.min.js"></script>
<script>
Macui.onReady(function () {

View File

@ -418,7 +418,7 @@ window.Macui = {
$("#mac_btn_group_middle").click(function () {
$("#mac .desktop").click();
});
$(document).on('click', '.mac-btn-refresh', function () {
$(document).on('click', '.layui-layer-refresh', function () {
let index = $(this).attr('index');
let iframe = Macui.getLayeroByIndex(index).find('iframe');
iframe.attr('src', iframe.attr('src'));
@ -1170,7 +1170,7 @@ window.Macui = {
layero_opened.css('z-index', Macui._countTask + 813);
Macui._settop(layero_opened);
//重新定义菜单布局
layero_opened.find('.layui-layer-setwin').prepend('<a class="mac-btn-refresh" index="' + index +
layero_opened.find('.layui-layer-setwin').prepend('<a class="layui-layer-ico layui-layer-refresh" index="' + index +
'" href="#"></a>');
//菜单排列倒序
layero_opened.find(".layui-layer-setwin>a").each(function () {