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 https://github.com/1099438829/macUI into dev_css 

# Conflicts:
#	css/index.min.css
This commit is contained in:
muzi_ys 2022-12-06 11:45:23 +08:00
parent d5dde7dda6 3beeb215e1
commit 405fdcb3f8
4 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
css/index.css
View File

@ -730,6 +730,7 @@ body .mac-btn_refresh {
.mac-open-iframe .layui-layer-ico { .mac-open-iframe .layui-layer-ico {
background: url(../img/frame/assets.png) no-repeat; background: url(../img/frame/assets.png) no-repeat;
background-size: 144px;
} }
.mac-open-iframe .layui-layer-setwin { .mac-open-iframe .layui-layer-setwin {
@ -751,8 +752,8 @@ body .mac-btn_refresh {
} }
.mac-open-iframe .layui-layer-setwin a { .mac-open-iframe .layui-layer-setwin a {
width: 20px; width: 1rem;
height: 20px; height: 1rem;
font-size: 13px; font-size: 13px;
overflow: hidden; overflow: hidden;
margin-left: 10px; margin-left: 10px;
@ -786,65 +787,65 @@ body .mac-btn_refresh {
.mac-open-iframe .layui-layer-min cite{display:none} .mac-open-iframe .layui-layer-min cite{display:none}
body .mac-open-iframe .layui-layer-setwin .layui-layer-min { body .mac-open-iframe .layui-layer-setwin .layui-layer-min {
background: url(../img/frame/assets.png) no-repeat; background: url(../img/frame/assets.png) no-repeat -3px -26px;
background-position: -3px -33px; background-size: 144px;
cursor: pointer; cursor: pointer;
} }
body .mac-open-iframe .layui-layer-setwin .layui-layer-min:hover { body .mac-open-iframe .layui-layer-setwin .layui-layer-min:hover {
background: url(../img/frame/assets.png) no-repeat; background: url(../img/frame/assets.png) no-repeat -3px -49px;
background-position: -3px -62px; background-size: 144px;
cursor: pointer; cursor: pointer;
} }
body .mac-open-iframe .layui-layer-setwin a.layui-layer-close { body .mac-open-iframe .layui-layer-setwin a.layui-layer-close {
background-position: -46px -33px; background-position: -37px -26px;
cursor: pointer; cursor: pointer;
} }
body .mac-open-iframe .layui-layer-setwin a.layui-layer-close:hover { body .mac-open-iframe .layui-layer-setwin a.layui-layer-close:hover {
background-position: -46px -62px; background-position: -37px -49px;
cursor: pointer; cursor: pointer;
} }
body .mac-open-iframe .layui-layer-setwin .layui-layer-max { body .mac-open-iframe .layui-layer-setwin .layui-layer-max {
background-position: -24px -33px; background-position: -20px -26px;
cursor: pointer; cursor: pointer;
} }
body .mac-open-iframe .layui-layer-setwin .layui-layer-max:hover { body .mac-open-iframe .layui-layer-setwin .layui-layer-max:hover {
background-position: -24px -62px; background-position: -20px -49px;
cursor: pointer; cursor: pointer;
} }
body .mac-open-iframe .layui-layer-setwin .layui-layer-maxmin { body .mac-open-iframe .layui-layer-setwin .layui-layer-maxmin {
background-position: -69px -33px; background-position: -55px -15px;
cursor: pointer; cursor: pointer;
} }
body .mac-open-iframe.layui-layer-setwin .layui-layer-maxmin:hover { body .mac-open-iframe.layui-layer-setwin .layui-layer-maxmin:hover {
background-position: -69px -62px; background-position: -55px -49px;
cursor: pointer; cursor: pointer;
} }
body .mac-open-iframe .layui-layer-setwin .layui-layer-refresh { body .mac-open-iframe .layui-layer-setwin .layui-layer-refresh {
background-position: -104px -32px; background-position: -83px -25px;
cursor: pointer; cursor: pointer;
} }
body .mac-open-iframe .layui-layer-setwin .layui-layer-refresh:hover { body .mac-open-iframe .layui-layer-setwin .layui-layer-refresh:hover {
background-position: -104px -61px; background-position: -83px -49px;
cursor: pointer; cursor: pointer;
} }
body .mac-open-iframe .layui-layer-setwin .layui-layer-change-url { body .mac-open-iframe .layui-layer-setwin .layui-layer-change-url {
background-position: -69px -32px; background-position: -55px -25px;
cursor: pointer; cursor: pointer;
} }
body .mac-open-iframe.layui-layer-setwin .layui-layer-change-url:hover { body .mac-open-iframe.layui-layer-setwin .layui-layer-change-url:hover {
background-position: -104px -61px; background-position: -83px -49px;
cursor: pointer; cursor: pointer;
} }

2
css/index.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
js/index.js
View File

@ -1169,13 +1169,15 @@ window.Macui = {
let layero_opened = Macui.getLayeroByIndex(index); let layero_opened = Macui.getLayeroByIndex(index);
layero_opened.css('z-index', Macui._countTask + 813); layero_opened.css('z-index', Macui._countTask + 813);
Macui._settop(layero_opened); Macui._settop(layero_opened);
//重新定义菜单布局
layero_opened.find('.layui-layer-setwin').prepend('<a class="layui-layer-ico layui-layer-refresh" index="' + index +
'" href="#"></a>');
//菜单排列倒序 //菜单排列倒序
layero_opened.find(".layui-layer-setwin>a").each(function () { layero_opened.find(".layui-layer-setwin>a").each(function () {
$(this).prependTo(layero_opened.find(".layui-layer-setwin")); if ($(this).hasClass('layui-layer-close')){
$(this).prependTo(layero_opened.find(".layui-layer-setwin"));
}
}) })
//重新定义菜单布局
layero_opened.find('.layui-layer-setwin').append('<a class="layui-layer-ico layui-layer-refresh" index="' + index +
'" href="#"></a>');
layero_opened.find('.layui-layer-setwin .layui-layer-max').click(function () { layero_opened.find('.layui-layer-setwin .layui-layer-max').click(function () {
setTimeout(function () { setTimeout(function () {
let height = layero_opened.css('height'); let height = layero_opened.css('height');

2
js/index.min.js vendored
View File

File diff suppressed because one or more lines are too long