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-06-23 19:14:39 +08:00
parent 6cf72afea4
commit 8d9543a6bb
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
css/login.css
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
.cm-tab-wrap-hack::after { content: ""; } .cm-tab-wrap-hack::after { content: ""; }
.com-user { position: fixed; display: flex; justify-content: center; align-items: center; background: rgb(255, 255, 255) none repeat scroll 0% 0%; } .com-user { position: fixed; display: flex; justify-content: center; align-items: center; background: rgb(255, 255, 255) none repeat scroll 0% 0%; }
.com-user, .com-user::after { top: 0px; left: 0px; bottom: 0px; right: 0px; z-index: 1000; } .com-user, .com-user::after { top: 0px; left: 0px; bottom: 0px; right: 0px; z-index: 1000; }
@ -24,7 +23,6 @@ button:active { border-color: rgb(36, 127, 255) rgb(18, 94, 237) rgb(0, 61, 219)
.layout-desktop .icons > div { display: flex; width: 150px; height: 150px; justify-content: center; align-items: center; flex-direction: column; } .layout-desktop .icons > div { display: flex; width: 150px; height: 150px; justify-content: center; align-items: center; flex-direction: column; }
.layout-desktop .icons > div img { max-width: 60px; max-height: 60px; } .layout-desktop .icons > div img { max-width: 60px; max-height: 60px; }
.layout-desktop .icons > div span { margin-top: 10px; color: rgb(255, 255, 255); font-size: 12px; } .layout-desktop .icons > div span { margin-top: 10px; color: rgb(255, 255, 255); font-size: 12px; }
=======
@charset "utf-8"; @charset "utf-8";
/* CSS Document */ /* CSS Document */
@ -89,4 +87,3 @@ i,em{font-style:normal;}
.foot em{ float:left} .foot em{ float:left}
.foot span{ float:right; padding-right:10px; color:#dae1e4;} .foot span{ float:right; padding-right:10px; color:#dae1e4;}
.foot span a{ padding:0 12px; font-size:14px; color:#dae1e4; } .foot span a{ padding:0 12px; font-size:14px; color:#dae1e4; }
>>>>>>> 6c820125c208f963bce20f07283261761fc8e1c8

11
css/macdefault.css
View File

@ -211,15 +211,16 @@ body {
#win10-menu { #win10-menu {
position: fixed; position: fixed;
top: 31px; top: 31px;
left: 0.5%;
background-color: rgba(255,255,255,0.55); background-color: rgba(255,255,255,0.55);
height:auto; height: auto;
width: 12.5%; width: 10%;
max-width: 880px; max-width: 880px;
overflow: auto; overflow: auto;
z-index: 1000; z-index: 1000;
overflow-y: hidden; overflow-y: hidden;
transition: bottom 0.5s ; transition: bottom 0.5s;
border-radius: 0 0 5px 5px; border-radius: 3px;
} }
#win10-menu.hidden { #win10-menu.hidden {
@ -873,7 +874,7 @@ body {
} }
#win10_btn_show_desktop { #win10_btn_show_desktop {
border-left: grey 1px solid; border-left: grey 1px solid;
width: 30px; width: 15px;
margin-left: 3px; margin-left: 3px;
padding: 0 !important padding: 0 !important
} }

1
demo.html
View File

@ -57,7 +57,6 @@
}) })
},2000); },2000);
}); });
</script> </script>
</head> </head>
<body> <body>

2
index.html
View File

@ -46,7 +46,6 @@
}) })
},2000); },2000);
}); });
</script> </script>
</head> </head>
<body> <body>
@ -88,7 +87,6 @@
</div> </div>
<div class="background blur"></div> <div class="background blur"></div>
</div> </div>
<div id="win10-menu" class="hidden"> <div id="win10-menu" class="hidden">
<div class="list win10-menu-hidden animated animated-slideOutLeft"> <div class="list win10-menu-hidden animated animated-slideOutLeft">
<div class="item" onclick="Win10.aboutUs()"><i class="icon fa fa-star fa-fw"></i>关于</div> <div class="item" onclick="Win10.aboutUs()"><i class="icon fa fa-star fa-fw"></i>关于</div>

4
js/mac.js
View File

@ -567,6 +567,10 @@ window.Win10 = {
this._bgs=bgs; this._bgs=bgs;
this._checkBgUrls(); this._checkBgUrls();
}, },
setBg:function (bgs) {
this._bgs=bgs;
this._checkBgUrls();
},
menuClose: function () { menuClose: function () {
$("#win10-menu").removeClass('opened'); $("#win10-menu").removeClass('opened');
$("#win10-menu").addClass('hidden'); $("#win10-menu").addClass('hidden');