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:21:24 +08:00
parent cef3912795
commit adb12b2cf8
2 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
css/macdefault.css
View File

@ -74,13 +74,9 @@ body {
height: 30px; height: 30px;
line-height:30px; line-height:30px;
/* IE9+ */ /* IE9+ */
<<<<<<< HEAD
background:rgba(255,255,255,0.5);
=======
background-color:rgba(255,255,255,0.5); background-color:rgba(255,255,255,0.5);
/* IE6-IE8 */ /* IE6-IE8 */
filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr=#68FFFFFF,endColorStr=#68FFFFFF); filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr=#68FFFFFF,endColorStr=#68FFFFFF);
>>>>>>> 6c820125c208f963bce20f07283261761fc8e1c8
z-index: 19930813; z-index: 19930813;
} }
@ -206,13 +202,8 @@ body {
} }
#win10-menu .list::-webkit-scrollbar,#win10_command_center::-webkit-scrollbar { #win10-menu .list::-webkit-scrollbar,#win10_command_center::-webkit-scrollbar {
<<<<<<< HEAD
width: 0;
height: 0;
=======
width: 8px; width: 8px;
height: 8px; height: 8px;
>>>>>>> 6c820125c208f963bce20f07283261761fc8e1c8
} }
#win10-menu .list::-webkit-scrollbar-track,#win10_command_center::-webkit-scrollbar-track { #win10-menu .list::-webkit-scrollbar-track,#win10_command_center::-webkit-scrollbar-track {
@ -889,11 +880,7 @@ body {
} }
#win10-menu .list .item, .sub-item{ #win10-menu .list .item, .sub-item{
<<<<<<< HEAD
width: calc(100% - 20px);
=======
width: 100%; width: 100%;
>>>>>>> 6c820125c208f963bce20f07283261761fc8e1c8
} }
#win10_btn_time{display: none} #win10_btn_time{display: none}

35
js/mac.js
View File

@ -572,11 +572,7 @@ window.Win10 = {
top: 30, top: 30,
'z-index': 100, 'z-index': 100,
}); });
<<<<<<< HEAD
$("#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: 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: calc(100% - 30px);position: absolute;left: 0;top: 30px; z-index: 0;background-color: transparent;'></div>")
>>>>>>> 6c820125c208f963bce20f07283261761fc8e1c8
} }
//属性绑定 //属性绑定
@ -633,36 +629,6 @@ window.Win10 = {
}, },
//渲染DOCK //渲染DOCK
renderDocks:function () { renderDocks:function () {
<<<<<<< HEAD
if(!Win10.isSmallScreen()){
$('#dock').Fisheye(
{
maxWidth: 60,
items: 'a',
itemsText: 'span',
container: '.dock-container',
itemWidth: 47,
proximity: 80,
alignment : 'left',
valign: 'bottom',
halign : 'center'
}
)
}else{
var cell_width=50;
var width=document.body.clientWidth ;
var docks=$(".dock .dock-container a");
var max_num=parseInt(width/cell_width)-1;
for (var i = 0; i < docks.length; i++) {
if (i>max_num) {
docks.eq(i).hide();
}else{
docks.eq(i).css('display','list-item');
}
}
}
=======
var cell_width=50; var cell_width=50;
var width=document.body.clientWidth ; var width=document.body.clientWidth ;
var docks=$(".dock .dock-container a"); var docks=$(".dock .dock-container a");
@ -705,7 +671,6 @@ window.Win10 = {
} }
} }
} }
>>>>>>> 6c820125c208f963bce20f07283261761fc8e1c8
}, },
commandCenterToggle: function () { commandCenterToggle: function () {
if($("#win10_command_center").hasClass('hidden_right')){ if($("#win10_command_center").hasClass('hidden_right')){