mirror of https://github.com/1099438829/macUI.git
改进dock
This commit is contained in:
parent
a7ca90f20e
commit
0cbf4d1157
|
|
@ -1249,7 +1249,7 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
#dock .dock-container {
|
#dock .dock-container {
|
||||||
width: 100%;
|
width: 100% !important;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
12
js/index.js
12
js/index.js
|
|
@ -2,7 +2,7 @@
|
||||||
* Created by Yuri2 on 2017/7/10.
|
* Created by Yuri2 on 2017/7/10.
|
||||||
*/
|
*/
|
||||||
window.Macui = {
|
window.Macui = {
|
||||||
_version: 'v1.1.2.5',
|
_version: 'v1.1.2.6',
|
||||||
_debug: true,
|
_debug: true,
|
||||||
_bgs: {
|
_bgs: {
|
||||||
main: '',
|
main: '',
|
||||||
|
|
@ -989,7 +989,7 @@ window.Macui = {
|
||||||
docks.eq(i).show();
|
docks.eq(i).show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (width > 768) {
|
if (!this.isSmallScreen()){
|
||||||
$('#dock').Fisheye({
|
$('#dock').Fisheye({
|
||||||
maxWidth: 70,
|
maxWidth: 70,
|
||||||
items: 'a',
|
items: 'a',
|
||||||
|
|
@ -1001,9 +1001,11 @@ window.Macui = {
|
||||||
valign: 'bottom',
|
valign: 'bottom',
|
||||||
halign: 'center'
|
halign: 'center'
|
||||||
})
|
})
|
||||||
} else {
|
}else {
|
||||||
$("#dock .dock-container").off('mousemove').off('mouseover').off('mouseout')
|
$("#dock .dock-container").css("width",width)
|
||||||
docks.off('mousemove').off('mouseover').off('mouseout')
|
docks.on('mouseover mousemove mouseout', function (e) {
|
||||||
|
e.stopPropagation()
|
||||||
|
}).css("width",cell_width).off('mouseover mousemove mouseout')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
commandCenterToggle: function () {
|
commandCenterToggle: function () {
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue