diff --git a/css/macdefault.css b/css/macdefault.css index 4bc4eb9..7572dba 100644 --- a/css/macdefault.css +++ b/css/macdefault.css @@ -62,9 +62,10 @@ body { #win10 hr { height:0px; border-top:1px solid #999; border-right:0px; border-bottom:0px; border-left:0px; } #win10 .desktop { - padding-top:30px; width: 100%; height: 100%; + position: fixed; + top: 0; } #win10_task_bar { @@ -202,8 +203,8 @@ body { } #win10-menu .list::-webkit-scrollbar,#win10_command_center::-webkit-scrollbar { - width: 8px; - height: 8px; + width: 0; + height: 0; } #win10-menu .list::-webkit-scrollbar-track,#win10_command_center::-webkit-scrollbar-track { @@ -763,7 +764,7 @@ body { height: 100%; position: absolute; left: 0; - top: 40px; + top: 0; z-index: 0; background-color: transparent; } diff --git a/js/mac.js b/js/mac.js index 8982794..ca1028b 100644 --- a/js/mac.js +++ b/js/mac.js @@ -270,10 +270,10 @@ window.Win10 = { var layero_opened=$(this); var height=layero_opened.css('height'); height=parseInt(height.replace('px','')); - if (height+40>=clientHeight){ - layero_opened.css('height',clientHeight-40); - layero_opened.find('.layui-layer-content').css('height',clientHeight-83); - layero_opened.find('.layui-layer-content iframe').css('height',clientHeight-83); + if (height+30>=clientHeight){ + layero_opened.css('height',clientHeight-30); + layero_opened.find('.layui-layer-content').css('height',clientHeight-62); + layero_opened.find('.layui-layer-content iframe').css('height',clientHeight-62); } }) }, @@ -572,7 +572,7 @@ window.Win10 = { top: 30, 'z-index': 100, }); - $("#win10 .desktop").append("
") + $("#win10 .desktop").append("
") } //属性绑定 @@ -613,7 +613,7 @@ window.Win10 = { $("#win10-msg-nof").removeClass('on-new-msg fa-commenting-o'); }, 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; $("#win10 #win10-shortcuts .shortcut").each(function () { $(this).css({