Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[All] fix bug 37587

Browse source
This commit is contained in:
Maxim Kadushkin 2018-05-03 19:02:09 +03:00
parent 4aa68f5eb5
commit 8e29326db7
5 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/common/main/lib/component/Mixtbar.js
View file

@ -127,8 +127,12 @@ define([
if ( this.isFolded ) {
if (!optsFold.$box) optsFold.$box = me.$el.find('.box-controls');
optsFold.$bar.addClass('folded').toggleClass('expanded', false);
optsFold.$bar.addClass('folded z-clear').toggleClass('expanded', false);
optsFold.$bar.find('.tabs .ribtab').removeClass('active');
optsFold.$bar.on($.support.transition.end, function (e) {
if ( optsFold.$bar.hasClass('folded') && !optsFold.$bar.hasClass('expanded') )
optsFold.$bar.toggleClass('z-clear', true);
});
optsFold.$box.on({
mouseleave: function (e) {
// optsFold.timer = setTimeout( function(e) {
@ -167,7 +171,7 @@ define([
} else {
// clearTimeout(optsFold.timer);
optsFold.$bar.removeClass('folded');
optsFold.$bar.removeClass('folded z-clear');
optsFold.$box.off();
var active_panel = optsFold.$box.find('.panel.active');
@ -191,6 +195,7 @@ define([
expand: function() {
// clearTimeout(optsFold.timer);
optsFold.$bar.removeClass('z-clear');
optsFold.$bar.addClass('expanded');
// optsFold.timer = setTimeout(this.collapse, optsFold.timeout);
},

4
apps/common/main/resources/less/toolbar.less
View file

@ -251,6 +251,10 @@
z-index: 102;
}
}
&:not(.cover):not(.z-clear) {
z-index: @zindex-navbar + 1;
}
}
.btn-toolbar {

4
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -2,10 +2,6 @@
@tabs-bg-color: #446995;
.toolbar {
&:not(.cover) {
z-index: 1001;
}
&.masked {
button.disabled .icon:not(.no-mask) {
background-position-x: 0px !important;

4
apps/presentationeditor/main/resources/less/toolbar.less
View file

@ -1,10 +1,6 @@
@tabs-bg-color: #aa5252;
.toolbar {
&:not(.cover) {
z-index: 1001;
}
&.masked {
button.disabled .icon:not(.no-mask) {
background-position-x: 0px !important;

4
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -1,10 +1,6 @@
@tabs-bg-color: #40865c;
.toolbar {
&:not(.cover) {
z-index: 1001;
}
&.masked {
button.disabled .icon:not(.no-mask) {
background-position-x: 0px !important;