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

Merge branch 'dev_css' of github.com:1099438829/macUI into dev_css

This commit is contained in:
muzi_ys 2024-11-22 10:10:08 +08:00
parent 5d99a8dd22 227b761429
commit c7825f870a
16 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
component/fontawesome-6.4.0/css/all.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

9
component/fontawesome-6.4.0/css/fontawesome.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

BIN
component/fontawesome-6.4.0/webfonts/fa-brands-400.ttf Normal file
View File

Binary file not shown.

BIN
component/fontawesome-6.4.0/webfonts/fa-brands-400.woff2 Normal file
View File

Binary file not shown.

BIN
component/fontawesome-6.4.0/webfonts/fa-regular-400.ttf Normal file
View File

Binary file not shown.

BIN
component/fontawesome-6.4.0/webfonts/fa-regular-400.woff2 Normal file
View File

Binary file not shown.

BIN
component/fontawesome-6.4.0/webfonts/fa-solid-900.ttf Normal file
View File

Binary file not shown.

BIN
component/fontawesome-6.4.0/webfonts/fa-solid-900.woff2 Normal file
View File

Binary file not shown.

BIN
component/fontawesome-6.4.0/webfonts/fa-v4compatibility.ttf Normal file
View File

Binary file not shown.

BIN
component/fontawesome-6.4.0/webfonts/fa-v4compatibility.woff2 Normal file
View File

Binary file not shown.

4
css/index.css
View File

@ -811,12 +811,12 @@ body .mac-open-iframe .layui-layer-setwin a.layui-layer-close:hover {
body .mac-open-iframe .layui-layer-setwin .layui-layer-max {
background-position: -20px -26px;
background-position: -20px -25.5px;
cursor: pointer;
}
body .mac-open-iframe .layui-layer-setwin .layui-layer-max:hover {
background-position: -20px -49px;
background-position: -20px -48.5px;
cursor: pointer;
}

2
css/index.min.css vendored
View File

File diff suppressed because one or more lines are too long

25
demo.html
View File

@ -9,8 +9,8 @@
<meta name="description" content="mac桌面">
<meta name="keywords" content="mac桌面">
<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="https://cdn.staticfile.org/animate.css/4.1.1/animate.min.css">
<link rel="stylesheet" href="./component/fontawesome-6.4.0/css/all.min.css">
<link rel="stylesheet" href="./css/index.min.css">
<link rel="stylesheet" href="./plugins/shortcut-drawer/shortcut-drawer.min.css">
</head>
@ -19,12 +19,12 @@
<div id="mac">
<div id="mac_task_bar" class="backgroud_blur">
<div id="mac_btn_group_left" class="btn_group">
<div id="mac_btn_win" class="btn"><span class="fa fa-apple"></span></div>
<div id="mac_btn_win" class="btn"><i class="fa-brands fa-apple"></i></div>
</div>
<div id="mac_btn_group_middle" class="btn_group"></div>
<div id="mac_btn_group_right" class="btn_group">
<div class="btn" id="mac_btn_time"></div>
<div class="btn" id="mac_btn_command"><span id="mac-msg-nof" class="fa fa-list-ul"></span></div>
<div class="btn" id="mac_btn_command"><i id="mac-msg-nof" class="fa-solid fa-list-ul"></i></div>
<div class="btn" id="mac_btn_show_desktop"></div>
</div>
</div>
@ -210,8 +210,8 @@
</div>
</div>
</body>
<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="https://cdn.staticfile.org/jquery/3.7.1/jquery.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/layer/3.5.1/layer.min.js"></script>
<script type="text/javascript" src="./js/index.min.js"></script>
<script type="text/javascript" src="./plugins/shortcut-drawer/shortcut-drawer.min.js"></script>
<script>
@ -230,18 +230,7 @@
setTimeout(function () {
Macui.newMsg('推荐全屏', '按下F11全屏以达到最佳视觉效果(点击进入)', function () {
Macui.enableFullScreen();
});
Macui.newMsg('最新资讯', '最新资讯信息', function () {
layer.open({
type: 2,
title: '最新资讯',
area: ['300px', '380px'],
shade: 0,
skin: 'mac-open-iframe',
offset: 'rb',
content: './broadcast.html'
});
});
})
}, 1500);
setTimeout(function () {

13
index.html
View File

@ -9,8 +9,8 @@
<meta name="description" content="mac桌面">
<meta name="keywords" content="mac桌面">
<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="https://cdn.staticfile.org/animate.css/4.1.1/animate.min.css">
<link rel="stylesheet" href="./component/fontawesome-6.4.0/css/all.min.css">
<link rel="stylesheet" href="./css/index.min.css">
<link rel="stylesheet" href="./plugins/shortcut-drawer/shortcut-drawer.min.css">
</head>
@ -19,12 +19,12 @@
<div id="mac">
<div id="mac_task_bar" class="backgroud_blur">
<div id="mac_btn_group_left" class="btn_group">
<div id="mac_btn_win" class="btn"><span class="fa fa-apple"></span></div>
<div id="mac_btn_win" class="btn"><i class="fa-brands fa-apple"></i></div>
</div>
<div id="mac_btn_group_middle" class="btn_group"></div>
<div id="mac_btn_group_right" class="btn_group">
<div class="btn" id="mac_btn_time"></div>
<div class="btn" id="mac_btn_command"><span id="mac-msg-nof" class="fa fa-list-ul"></span></div>
<div class="btn" id="mac_btn_command"><i id="mac-msg-nof" class="fa-solid fa-list-ul"></i></div>
<div class="btn" id="mac_btn_show_desktop"></div>
</div>
</div>
@ -142,9 +142,8 @@
</div>
</div>
</body>
<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="https://cdn.staticfile.org/jquery/3.7.1/jquery.min.js"></script>
<script type="text/javascript" src="https://cdn.staticfile.org/layer/3.5.1/layer.min.js"></script>
<script type="text/javascript" src="./js/index.min.js"></script>
<script type="text/javascript" src="./plugins/shortcut-drawer/shortcut-drawer.min.js"></script>
<script>

3
js/index.js
View File

@ -1204,7 +1204,6 @@ window.Macui = {
}
Macui.renderDocks();
btn.click(function () {
console.log(444444)
let index = $(this).attr('index');
let layero = Macui.getLayeroByIndex(index);
let settop = function () {
@ -1220,7 +1219,6 @@ window.Macui = {
layero.css('z-index', max_zindex + 1);
};
if ($(this).hasClass('show')) {
console.log(444222)
if ($(this).hasClass('active')) {
$(this).removeClass('active');
$(this).removeClass('show');
@ -1232,7 +1230,6 @@ window.Macui = {
Macui._settop(layero);
}
} else {
console.log(3333)
$(this).addClass('show');
$('#dock .dock-container li.active').removeClass('active');
$(this).addClass('active');

2
js/index.min.js vendored
View File

File diff suppressed because one or more lines are too long