diff --git a/css/macdefault.css b/css/macdefault.css index c2b9495..120514f 100644 --- a/css/macdefault.css +++ b/css/macdefault.css @@ -918,6 +918,19 @@ body { .dock{ width: 100%; + height:60px; border-radius: 0px; } + .dock .dock-container{ + width: 100%; + border-radius: 0px; + } + + .dock a.dock-item{ + width: 100%; + margin-left: 25px; + float:left; + position: static; + } + } \ No newline at end of file diff --git a/js/mac.js b/js/mac.js index 4824207..5722e7d 100644 --- a/js/mac.js +++ b/js/mac.js @@ -551,7 +551,7 @@ window.Win10 = { top: 30, 'z-index': 100, }); - $("#win10 .desktop").append("
") + $("#win10 .desktop").append("") } //属性绑定 @@ -608,8 +608,19 @@ window.Win10 = { }, //渲染DOCK renderDocks:function () { - $('#dock').Fisheye( - { + var cell_width=50; + var width=document.body.clientWidth ; + var docks=$(".dock .dock-container a"); + var max_num=parseInt((width-40)/(cell_width+25))-1; + for (var i = 0; i <= docks.length; i++) { + if (i>=max_num) { + docks.eq(i).hide(); + }else{ + docks.eq(i).show(); + } + } + if(width>768){ + $('#dock').Fisheye({ maxWidth: 70, items: 'a', itemsText: 'span', @@ -619,20 +630,26 @@ window.Win10 = { alignment : 'left', valign: 'bottom', halign : 'center' - } - ) - - 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).show(); - } - } + }) + }else{ + $('.dock-container').css({'width':width}); + for (var i = 0; i < max_num; i++) { + + docks.on('mouseover', function(e) { + e.preventDefault(); + }); + docks.on('mouseout', function(e) { + e.preventDefault(); + }); + docks.on('click', function(e) { + e.preventDefault(); + }); + docks.unbind("mouseover").unbind('mouseout').unbind('click').css({"width":cell_width}); + if(i==0){ + docks.eq(i).css("margin-left",0); + } + } + } }, commandCenterToggle: function () { if($("#win10_command_center").hasClass('hidden_right')){