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

[All] correction z-order for synchronize tooltip

Browse source
This commit is contained in:
Maxim Kadushkin 2018-04-24 20:07:04 +03:00
parent a9eb64fa3a
commit 326e5bfa98
7 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/SynchronizeTip.js
View file

@ -48,7 +48,7 @@ define([
}, },
template: _.template([ template: _.template([
'<div class="synch-tip-root <%= scope.placement %>">', '<div class="synch-tip-root <% if (!!scope.options.extCls) {print(scope.options.extCls + \" \");} %><%= scope.placement %>">',
'<div class="asc-synchronizetip">', '<div class="asc-synchronizetip">',
'<div class="tip-arrow <%= scope.placement %>"></div>', '<div class="tip-arrow <%= scope.placement %>"></div>',
'<div>', '<div>',

4
apps/common/main/resources/less/synchronize-tip.less
View file

@ -3,6 +3,10 @@
z-index: @zindex-navbar + 2; z-index: @zindex-navbar + 2;
width: 300px; width: 300px;
&.inc-index {
z-index: @zindex-navbar + 4;
}
.tip-arrow { .tip-arrow {
position: absolute; position: absolute;
overflow: hidden; overflow: hidden;

1
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -2052,6 +2052,7 @@ define([
createSynchTip: function () { createSynchTip: function () {
this.synchTooltip = new Common.UI.SynchronizeTip({ this.synchTooltip = new Common.UI.SynchronizeTip({
extCls: this.mode.isDesktopApp ? 'inc-index' : undefined,
target: this.btnCollabChanges.$el target: this.btnCollabChanges.$el
}); });
this.synchTooltip.on('dontshowclick', function () { this.synchTooltip.on('dontshowclick', function () {

1
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1404,6 +1404,7 @@ define([
createSynchTip: function () { createSynchTip: function () {
this.synchTooltip = new Common.UI.SynchronizeTip({ this.synchTooltip = new Common.UI.SynchronizeTip({
extCls: this.mode.isDesktopApp ? 'inc-index' : undefined,
target: this.btnCollabChanges.$el target: this.btnCollabChanges.$el
}); });
this.synchTooltip.on('dontshowclick', function () { this.synchTooltip.on('dontshowclick', function () {

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

@ -25,11 +25,11 @@
position: absolute; position: absolute;
top: 32px; top: 32px;
left: 48px; left: 48px;
right: 45px; right: 0;
bottom: 0; bottom: 0;
opacity: 0; opacity: 0;
background-color: @gray-light; background-color: @gray-light;
z-index: @zindex-tooltip + 1; /*z-index: @zindex-tooltip + 1;*/
} }
.menu-layouts { .menu-layouts {

1
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -1756,6 +1756,7 @@ define([
createSynchTip: function () { createSynchTip: function () {
this.synchTooltip = new Common.UI.SynchronizeTip({ this.synchTooltip = new Common.UI.SynchronizeTip({
extCls: this.mode.isDesktopApp ? 'inc-index' : undefined,
target: this.btnCollabChanges.$el target: this.btnCollabChanges.$el
}); });
this.synchTooltip.on('dontshowclick', function() { this.synchTooltip.on('dontshowclick', function() {

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

@ -47,11 +47,11 @@
position: absolute; position: absolute;
top: 32px; top: 32px;
left: 48px; left: 48px;
right: 45px; right: 0;
bottom: 0; bottom: 0;
opacity: 0; opacity: 0;
background-color: @gray-light; background-color: @gray-light;
z-index: @zindex-tooltip + 1; /*z-index: @zindex-tooltip + 1;*/
} }
.color-schemas-menu { .color-schemas-menu {