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-01-11 14:24:22 +08:00
parent bdd44e471a
commit 74533f52da
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
css/macdefault.css
View File

@ -63,7 +63,11 @@ body {
#win10 .desktop { #win10 .desktop {
width: 100%; width: 100%;
height: 100%; height: calc(100% - 90px);
position: absolute;
left: 0px;
top: 30px;
bottom: 60px;
} }
#win10_task_bar { #win10_task_bar {
@ -322,10 +326,10 @@ body {
} }
#win10 #win10-shortcuts { #win10 #win10-shortcuts {
height: calc(100% - 30px); height:100%;
position: absolute; position: absolute;
left: 0; left: 0;
top: 30px; top: 0;
z-index: 100; z-index: 100;
} }
@ -373,10 +377,10 @@ body {
#win10_command_center { #win10_command_center {
position: fixed; position: fixed;
right: 0; right: 0;
top: 31px; top: 30px;
width: 350px; width: 350px;
background-color: rgba(255, 255, 255, 0.7); background-color: rgba(255, 255, 255, 0.7);
height: calc(100% - 32px); height: calc(100% - 30px);
transition: all 0.5s; transition: all 0.5s;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
@ -689,7 +693,7 @@ body {
.win10-open-iframe .layui-layer-content{ .win10-open-iframe .layui-layer-content{
background-color: white; background-color: white;
max-height: calc(100% - 30px); max-height:100%;
} }
.win10-open-iframe .layui-layer-title{ .win10-open-iframe .layui-layer-title{

24
index.html
View File

@ -52,6 +52,18 @@
</head> </head>
<body> <body>
<div id="win10"> <div id="win10">
<div id="win10_task_bar">
<div id="win10_btn_group_left" class="btn_group">
<div id="win10_btn_win" class="btn"><span class="fa fa-apple"></span></div>
<div class="btn" id="win10-btn-browser"><span class="fa fa-safari"></span></div>
</div>
<div id="win10_btn_group_middle" class="btn_group"></div>
<div id="win10_btn_group_right" class="btn_group">
<div class="btn" id="win10_btn_time"></div>
<div class="btn" id="win10_btn_command"><span id="win10-msg-nof" class="fa fa-list-ul"></span></div>
<div class="btn" id="win10_btn_show_desktop"></div>
</div>
</div>
<div class="desktop"> <div class="desktop">
<div id="win10-shortcuts" class="shortcuts-hidden"> <div id="win10-shortcuts" class="shortcuts-hidden">
<div class="shortcut" onclick="Win10.openUrl('http://win10ui.yuri2.cn','<img class=\'icon\' src=\'./img/icon/computer.png\'/>UI官网')"> <div class="shortcut" onclick="Win10.openUrl('http://win10ui.yuri2.cn','<img class=\'icon\' src=\'./img/icon/computer.png\'/>UI官网')">
@ -78,18 +90,6 @@
<div class="command-body today"></div> <div class="command-body today"></div>
<!-- <span id="win10_btn_command_center_clean_all">全部清除</span> --> <!-- <span id="win10_btn_command_center_clean_all">全部清除</span> -->
<div class="command-body msgs"></div> <div class="command-body msgs"></div>
</div>
<div id="win10_task_bar">
<div id="win10_btn_group_left" class="btn_group">
<div id="win10_btn_win" class="btn"><span class="fa fa-apple"></span></div>
<div class="btn" id="win10-btn-browser"><span class="fa fa-safari"></span></div>
</div>
<div id="win10_btn_group_middle" class="btn_group"></div>
<div id="win10_btn_group_right" class="btn_group">
<div class="btn" id="win10_btn_time"></div>
<div class="btn" id="win10_btn_command"><span id="win10-msg-nof" class="fa fa-list-ul"></span></div>
<div class="btn" id="win10_btn_show_desktop"></div>
</div>
</div> </div>
<div id="footer"> <div id="footer">
<div class="dock"> <div class="dock">

13
js/mac.js
View File

@ -560,10 +560,10 @@ window.Win10 = {
$("#win10-shortcuts").css({ $("#win10-shortcuts").css({
position: 'absolute', position: 'absolute',
left: 0, left: 0,
top: 30, top: 0,
'z-index': 100, 'z-index': 100,
}); });
$("#win10 .desktop").append("<div id='win10-desktop-scene' style='width: 100%;height: calc(100% - 30px);position: absolute;left: 0;top: 30px; z-index: 0;background-color: transparent;'></div>") $("#win10 .desktop").append("<div id='win10-desktop-scene' style='width: 100%;height:100%;position: absolute;left: 0;top:0; z-index: 0;background-color: transparent;'></div>")
} }
//属性绑定 //属性绑定
@ -795,6 +795,7 @@ window.Win10 = {
} }
var area,offset; var area,offset;
if (this.isSmallScreen() || areaAndOffset==='max') { if (this.isSmallScreen() || areaAndOffset==='max') {
console.log(111);
area = ['100%', (document.body.clientHeight - 30) + 'px']; area = ['100%', (document.body.clientHeight - 30) + 'px'];
offset = ['30px', '0']; offset = ['30px', '0'];
}else if(typeof areaAndOffset ==='object'){ }else if(typeof areaAndOffset ==='object'){
@ -834,7 +835,7 @@ window.Win10 = {
}, },
full:function (layero) { full:function (layero) {
layero.find('.layui-layer-min').css('display','inline-block'); layero.find('.layui-layer-min').css('display','inline-block');
layero_opened.css('margin-top',30); layero_opened.css('top',30);
}, },
}); });
$('#win10_btn_group_middle .btn.active').removeClass('active'); $('#win10_btn_group_middle .btn.active').removeClass('active');
@ -853,9 +854,9 @@ window.Win10 = {
var height=layero_opened.css('height'); var height=layero_opened.css('height');
height=parseInt(height.replace('px','')); height=parseInt(height.replace('px',''));
if (height>=document.body.clientHeight){ if (height>=document.body.clientHeight){
layero_opened.css('height',height-30); layero_opened.css('height',height-32);
layero_opened.find('.layui-layer-content').css('height',height-72); layero_opened.find('.layui-layer-content').css('height',height-62);
layero_opened.find('.layui-layer-content iframe').css('height',height-72); layero_opened.find('.layui-layer-content iframe').css('height',height-62);
} }
},300); },300);