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_ys 2019-01-13 22:27:53 +08:00
parent 74533f52da
commit e0662f143a
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
css/macdefault.css
View File

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

10
js/mac.js
View File

@ -227,10 +227,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);
} }
}) })
}, },
@ -560,7 +560,7 @@ window.Win10 = {
$("#win10-shortcuts").css({ $("#win10-shortcuts").css({
position: 'absolute', position: 'absolute',
left: 0, left: 0,
top: 0, top: 30,
'z-index': 100, 'z-index': 100,
}); });
$("#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>") $("#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>")