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:
1099438829@qq.com 2019-03-25 15:28:02 +08:00
parent adb12b2cf8
commit 2f95667991
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
css/macdefault.css
View File

@ -62,9 +62,10 @@ body {
#win10 hr { height:0px; border-top:1px solid #999; border-right:0px; border-bottom:0px; border-left:0px; } #win10 hr { height:0px; border-top:1px solid #999; border-right:0px; border-bottom:0px; border-left:0px; }
#win10 .desktop { #win10 .desktop {
padding-top:30px;
width: 100%; width: 100%;
height: 100%; height: 100%;
position: fixed;
top: 0;
} }
#win10_task_bar { #win10_task_bar {
@ -202,8 +203,8 @@ body {
} }
#win10-menu .list::-webkit-scrollbar,#win10_command_center::-webkit-scrollbar { #win10-menu .list::-webkit-scrollbar,#win10_command_center::-webkit-scrollbar {
width: 8px; width: 0;
height: 8px; height: 0;
} }
#win10-menu .list::-webkit-scrollbar-track,#win10_command_center::-webkit-scrollbar-track { #win10-menu .list::-webkit-scrollbar-track,#win10_command_center::-webkit-scrollbar-track {
@ -763,7 +764,7 @@ body {
height: 100%; height: 100%;
position: absolute; position: absolute;
left: 0; left: 0;
top: 40px; top: 0;
z-index: 0; z-index: 0;
background-color: transparent; background-color: transparent;
} }

12
js/mac.js
View File

@ -270,10 +270,10 @@ window.Win10 = {
var layero_opened=$(this); var layero_opened=$(this);
var height=layero_opened.css('height'); var height=layero_opened.css('height');
height=parseInt(height.replace('px','')); height=parseInt(height.replace('px',''));
if (height+40>=clientHeight){ if (height+30>=clientHeight){
layero_opened.css('height',clientHeight-40); layero_opened.css('height',clientHeight-30);
layero_opened.find('.layui-layer-content').css('height',clientHeight-83); layero_opened.find('.layui-layer-content').css('height',clientHeight-62);
layero_opened.find('.layui-layer-content iframe').css('height',clientHeight-83); layero_opened.find('.layui-layer-content iframe').css('height',clientHeight-62);
} }
}) })
}, },
@ -572,7 +572,7 @@ window.Win10 = {
top: 30, top: 30,
'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>")
} }
//属性绑定 //属性绑定
@ -613,7 +613,7 @@ window.Win10 = {
$("#win10-msg-nof").removeClass('on-new-msg fa-commenting-o'); $("#win10-msg-nof").removeClass('on-new-msg fa-commenting-o');
}, },
renderShortcuts:function () { renderShortcuts:function () {
var h=parseInt(($("#win10 #win10-shortcuts")[0].offsetHeight-60)/100); var h=parseInt(($("#win10 #win10-shortcuts")[0].offsetHeight-90)/100);
var x=0,y=0; var x=0,y=0;
$("#win10 #win10-shortcuts .shortcut").each(function () { $("#win10 #win10-shortcuts .shortcut").each(function () {
$(this).css({ $(this).css({