pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 06:08:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v9.0.0' into feature/celleditor-skeleton

Browse Source
This commit is contained in:
Alexey Koshelev
2025-05-29 12:44:37 +03:00
parent 7b776c21a2 1fd279de66
commit dbb9e29ce5
23 changed files with 128 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/common/main/lib/component/Mixtbar.js
View File

@ -157,6 +157,10 @@ define([
Common.NotificationCenter.on('app:repaint', _.bind(function() {
this.repaintMoreBtns();
}, this));
Common.NotificationCenter.on('uitheme:changed', _.bind(function() {
this.clearActiveData();
this.processPanelVisible();
}, this));
},
afterRender: function() {
@ -333,6 +337,8 @@ define([
}
if ( tab ) {
this.fireEvent('tab:active:before', [tab]);
me.$tabs.removeClass('active');
me.$panels.removeClass('active');
me.hideMoreBtns();

2
apps/common/main/lib/controller/Themes.js
View File

@ -85,7 +85,7 @@ define([
--sk-background-toolbar-header-slide: #BE664F;; --sk-background-toolbar-header-cell: #40865c;
--sk-background-toolbar-header-visio: #444796;
--sk-background-toolbar: #f7f7f7; --sk-background-toolbar-controls: #f1f1f1;
--sk-background-toolbar-tab: rgba(255,255,255,.15); --sk-background-toolbar-button: #e0e0e0;
--sk-background-toolbar-tab: rgba(255,255,255,.15); --sk-background-toolbar-button: #d8dadc;
--sk-layout-padding-toolbar-controls: 0 7px; --sk-layout-padding-header: 0 8px;
--sk-canvas-background: #eee; --sk-canvas-content-background: #fff;
--sk-canvas-page-border: #dde0e5; --sk-canvas-line: rgba(0,0,0,.05);

2
apps/common/main/lib/util/themeinit.js
View File

@ -88,7 +88,7 @@
}
window.uitheme.apply_icons_from_url = function (themeid, url) {
// if ( !url ) return;
if ( !url ) return;
let base_url = !url.endsWith('/') ? url + '/' : url;
const sp_names = ['small', 'big', 'huge'];

5
apps/common/main/lib/view/Header.js
View File

@ -1315,7 +1315,10 @@ define([
updateAvatarEl: function(){
if(this.options.userAvatar){
$btnUserName.css({'background-image': 'url('+ this.options.userAvatar +')'});
$btnUserName.css({
'background-image': 'url('+ this.options.userAvatar +')',
'background-color': 'transparent'
});
$btnUserName.text('');
} else {
$btnUserName.text(Common.Utils.getUserInitials(this.options.userName));

45
apps/common/main/resources/less/buttons.less
View File

@ -301,6 +301,7 @@
//align-items: center;
align-items: start;
height: 24px;
height: calc((@font-size-base-app + 2px) * 2);
.caption {
max-width: 160px;//85px;
@ -308,7 +309,7 @@
text-overflow: ellipsis;
white-space: pre;
line-height: 11px;
line-height: 1;
padding: 0 2px;
.caret {
@ -679,14 +680,6 @@
float: right;
}
&:first-child:not(:last-child):not(.dropdown-toggle) {
.rtl & {
.border-radius(@border-radius-button-normal);
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
}
&.btn-toolbar {
float: none;
}
@ -702,11 +695,35 @@
}
}
> .dropdown-toggle:not(first-child) {
.rtl & {
.border-radius(@border-radius-button-normal);
border-top-right-radius: 0;
border-bottom-right-radius: 0;
&:not(.x-huge) {
> .btn:first-child:not(:last-child):not(.dropdown-toggle) {
.rtl & {
&.btn-toolbar {
.border-radius(@border-radius-button-toolbar);
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
&:not(.btn-toolbar) {
.border-radius(@border-radius-button-normal);
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
}
}
> .dropdown-toggle:not(:first-child) {
.rtl & {
&.btn-toolbar {
.border-radius(@border-radius-button-toolbar);
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
&:not(.btn-toolbar) {
.border-radius(@border-radius-button-normal);
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
}
}
}

4
apps/common/main/resources/less/combobox.less
View File

@ -74,8 +74,8 @@
//border-color: @border-regular-control-ie;
//border-color: @border-regular-control;
border-color: @border-fill-input;
//background-color: transparent;
background-color: @background-fill-input;
background-color: transparent;
//background-color: @background-fill-input;
margin-left: -1px;
position: absolute;
top: 0;

3
apps/common/main/resources/less/header.less
View File

@ -337,6 +337,7 @@
height: @x-small-btn-icon-size;
top: 50%;
margin-top: -10px;
margin-top: calc(-1 * @font-size-base-app + 1px);
fill: @icon-toolbar-header-ie;
fill: @icon-toolbar-header;
}
@ -346,6 +347,8 @@
cursor: pointer;
.font-size-tiny();
margin-left: -18px;
margin-top: @scaled-one-px-value-ie;
margin-top: @scaled-one-px-value;
width: 16px;
text-align: center;
overflow: hidden;

19
apps/documenteditor/main/app/view/RightMenu.js
View File

@ -38,6 +38,7 @@
var SCALE_MIN = 40;
var MENU_SCALE_PART = 260;
var MENU_BASE_WIDTH = 220;
define([
'text!documenteditor/main/app/template/RightMenu.template',
@ -160,16 +161,22 @@ define([
this.defaultHideRightMenu = !(mode.customization && (mode.customization.hideRightMenu===false));
var open = !Common.localStorage.getBool("de-hide-right-settings", this.defaultHideRightMenu);
Common.Utils.InternalSettings.set("de-hide-right-settings", !open);
this.$el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
this.$el.show();
Common.NotificationCenter.on('app:repaint', _.bind(function() {
this.$el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
}, this));
Common.NotificationCenter.on('uitheme:changed', _.bind(function() {
this.updateWidth();
Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
}, this));
var $markup = $(this.template({scope: this}));
this.$el.html($markup);
this.updateWidth();
this.$el.show();
this.btnMoreContainer = $markup.find('#slot-right-menu-more');
Common.UI.SideMenu.prototype.render.call(this);
this.btnMore.menu.menuAlign = 'tr-tl';
@ -381,6 +388,14 @@ define([
Common.UI.SideMenu.prototype.setButtons.apply(this, [allButtons]);
},
updateWidth: function() {
var pane = $(this.el).find('.right-panel'),
paddings = parseInt(pane.css('padding-left')) + parseInt(pane.css('padding-right'));
pane.css('width', MENU_BASE_WIDTH + paddings + 'px');
MENU_SCALE_PART = SCALE_MIN + MENU_BASE_WIDTH + paddings;
this.$el.css('width', (!Common.Utils.InternalSettings.get("de-hide-right-settings") ? MENU_SCALE_PART : SCALE_MIN) + 'px');
},
txtParagraphSettings: 'Paragraph Settings',
txtImageSettings: 'Image Settings',
txtTableSettings: 'Table Settings',

11
apps/documenteditor/main/index.html
View File

@ -135,16 +135,6 @@
opacity: 0.4;
}
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 20px;
height: 20px;
border-radius: 20px;
/*margin: 0 10px;*/
background: rgba(0,0,0,.15);
background: var(--sk-background-toolbar-tab);
}
.loadmask > .sktoolbar {
background: #f1f1f1;
/*height: 66px;*/
@ -355,7 +345,6 @@
<div class="brendpanel" style="display: none;">
<div>
<div class="spacer"></div>
<div class="circle"></div>
</div>
<div>
<span class="rect"></span>

11
apps/documenteditor/main/index.html.deploy
View File

@ -86,15 +86,6 @@
opacity: 0.4;
}
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 20px;
height: 20px;
border-radius: 20px;
background: rgba(0,0,0,.15);
background: var(--sk-background-toolbar-tab);
}
.loadmask > .sktoolbar {
background: #f1f1f1;
padding: 0;
@ -284,7 +275,7 @@
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
<script src="../../../../../apps/common/main/lib/util/docserviceworker.js?__inline=true"></script>
<div id="loading-mask" class="loadmask"><div class="brendpanel" style="display: none;"><div><div class="spacer"></div><div class="circle"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div>
<div id="loading-mask" class="loadmask"><div class="brendpanel" style="display: none;"><div><div class="spacer"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div>
<div id="sktoolbar" class="sktoolbar" style="display: none;"><section class="box-controls"><ul><li class="compact" style="width: 30px;display: none;"></li><li class="compact space" style="display: none;"></li><li class="compact" style="width: 90px;display: none;"></li><li class="not-compact" style="width: 63px;"></li><li class="space"></li><li style="width: 234px;"></li><li class="space"></li><li style="width: 189px;"></li><li class="fat"></li></ul><ul><li class="compact" style="width: 30px;display: none;"></li><li class="compact space" style="display: none;"></li><li class="compact" style="width: 90px;display: none;"></li><li class="not-compact" style="width: 63px;"></li><li class="space"></li><li style="width: 234px;"></li><li class="space"></li><li style="width: 189px;"></li></ul></section></div>
<div id="sktoolbar-pdf" class="sktoolbar" style="display: none;"><ul><li class="compact" style="width: 30px;display: none;"></li><li class="compact space" style="display: none;"></li><li class="compact" style="width: 90px;display: none;"></li><li class="not-compact" style="width: 63px;"></li><li class="space" style="width: 98px;"></li><li style="width: 105px;"></li><li class="space"></li><li style="width: 160px;"></li></ul><ul><li class="compact" style="width: 30px;display: none;"></li><li class="compact space" style="display: none;"></li><li class="compact" style="width: 90px;display: none;"></li><li class="not-compact" style="width: 63px;"></li><li class="space"></li><li class="big"/><li class="big"/><li class="space"></li><li style="width: 105px;"></li><li class="space"></li><li style="width: 160px;"></li><li class="big"/><li class="big"/><li class="big"/></ul></div>
<div class="placeholder" style="display: none;"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>

2
apps/pdfeditor/main/app/view/FormSettings.js
View File

@ -777,6 +777,7 @@ define([
});
this.sldrPreviewPositionX.on('change', _.bind(this.onImagePositionChange, this, 'x'));
this.sldrPreviewPositionX.on('changecomplete', _.bind(this.onImagePositionChangeComplete, this, 'x'));
this.lockedControls.push(this.sldrPreviewPositionX);
this.sldrPreviewPositionY = new Common.UI.SingleSlider({
el: $markup.findById('#form-img-slider-position-y'),
@ -788,6 +789,7 @@ define([
});
this.sldrPreviewPositionY.on('change', _.bind(this.onImagePositionChange, this, 'y'));
this.sldrPreviewPositionY.on('changecomplete', _.bind(this.onImagePositionChangeComplete, this, 'y'));
this.lockedControls.push(this.sldrPreviewPositionY);
var xValue = this.sldrPreviewPositionX.getValue(),
yValue = this.sldrPreviewPositionY.getValue();

20
apps/pdfeditor/main/app/view/RightMenu.js
View File

@ -38,6 +38,7 @@
var SCALE_MIN = 40;
var MENU_SCALE_PART = 260;
var MENU_BASE_WIDTH = 220;
define([
'text!pdfeditor/main/app/template/RightMenu.template',
@ -148,16 +149,21 @@ define([
this.defaultHideRightMenu = !(mode.customization && (mode.customization.hideRightMenu===false));
var open = !Common.localStorage.getBool("pdfe-hide-right-settings", this.defaultHideRightMenu);
Common.Utils.InternalSettings.set("pdfe-hide-right-settings", !open);
el.css('width', SCALE_MIN + 'px');
// el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
el.show();
Common.NotificationCenter.on('app:repaint', function() {
el.css('width', SCALE_MIN + 'px');
});
Common.NotificationCenter.on('uitheme:changed', _.bind(function() {
this.updateWidth();
Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
}, this));
el.html(this.template({scope: this}));
this.updateWidth();
el.show();
this.btnMoreContainer = $('#slot-right-menu-more');
Common.UI.SideMenu.prototype.render.call(this);
this.btnMore.menu.menuAlign = 'tr-tl';
@ -340,6 +346,14 @@ define([
Common.UI.SideMenu.prototype.setButtons.apply(this, [allButtons]);
},
updateWidth: function() {
var pane = $(this.el).find('.right-panel'),
paddings = parseInt(pane.css('padding-left')) + parseInt(pane.css('padding-right'));
pane.css('width', MENU_BASE_WIDTH + paddings + 'px');
MENU_SCALE_PART = SCALE_MIN + MENU_BASE_WIDTH + paddings;
this.$el.css('width', (this.GetActivePane() ? MENU_SCALE_PART : SCALE_MIN) + 'px');
},
txtParagraphSettings: 'Text Settings',
txtImageSettings: 'Image Settings',
txtTableSettings: 'Table Settings',

11
apps/pdfeditor/main/index.html
View File

@ -109,16 +109,6 @@
opacity: 0.4;
}
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 20px;
height: 20px;
border-radius: 20px;
/* margin: 0 10px; */
background: rgba(0,0,0,.15);
background: var(--sk-background-toolbar-tab);
}
.loadmask > .sktoolbar {
background: #f1f1f1;
/*height: 66px;*/
@ -323,7 +313,6 @@
<div class="brendpanel" style="display: none;">
<div>
<div class="spacer"></div>
<div class="circle"></div>
</div>
<div>
<span class="rect"></span>

11
apps/pdfeditor/main/index.html.deploy
View File

@ -80,15 +80,6 @@
opacity: 0.4;
}
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 20px;
height: 20px;
border-radius: 20px;
background: rgba(0,0,0,.15);
background: var(--sk-background-toolbar-tab);
}
.loadmask > .sktoolbar {
background: #f1f1f1;
padding: 0;
@ -272,7 +263,7 @@
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
<script src="../../../../../apps/common/main/lib/util/docserviceworker.js?__inline=true"></script>
<div id="loading-mask" class="loadmask"><div class="brendpanel" style="display: none;"><div><div class="spacer"></div><div class="circle"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div><div class="sktoolbar" style="display: none;"><section class="box-controls"><ul><li class="compact" style="width: 30px;display: none;"></li><li class="compact space" style="display: none;"></li><li class="compact" style="width: 90px;display: none;"></li><li class="not-compact" style="width: 63px;"></li><li class="space" style="width: 144px;"></li><li style="width: 105px;"></li><li class="space"></li><li style="width: 160px;"></li></ul><ul><li class="compact" style="width: 30px;display: none;"></li><li class="compact space" style="display: none;"></li><li class="compact" style="width: 90px;display: none;"></li><li class="not-compact" style="width: 63px;"></li><li class="space"></li><li class="big"/><li class="big"/><li class="big"/><li class="space"></li><li style="width: 105px;"></li><li class="space"></li><li style="width: 160px;"></li></ul></section></div><div class="placeholder" style="display: none;"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
<div id="loading-mask" class="loadmask"><div class="brendpanel" style="display: none;"><div><div class="spacer"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div><div class="sktoolbar" style="display: none;"><section class="box-controls"><ul><li class="compact" style="width: 30px;display: none;"></li><li class="compact space" style="display: none;"></li><li class="compact" style="width: 90px;display: none;"></li><li class="not-compact" style="width: 63px;"></li><li class="space" style="width: 144px;"></li><li style="width: 105px;"></li><li class="space"></li><li style="width: 160px;"></li></ul><ul><li class="compact" style="width: 30px;display: none;"></li><li class="compact space" style="display: none;"></li><li class="compact" style="width: 90px;display: none;"></li><li class="not-compact" style="width: 63px;"></li><li class="space"></li><li class="big"/><li class="big"/><li class="big"/><li class="space"></li><li style="width: 105px;"></li><li class="space"></li><li style="width: 160px;"></li></ul></section></div><div class="placeholder" style="display: none;"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
<div id="viewport" role="main"></div>
<script>

4
apps/presentationeditor/main/app/controller/Toolbar.js
View File

@ -142,6 +142,7 @@ define([
'title:hide' : this.onTitleHide.bind(this),
'footers:hide' : this.onFootersHide.bind(this),
'tab:active' : this.onActiveTab.bind(this),
'tab:active:before' : this.onBeforeActiveTab.bind(this),
'tab:collapse' : this.onTabCollapse.bind(this)
},
'DocumentHolder': {
@ -3173,6 +3174,9 @@ define([
setTimeout(function() {
Common.UI.TooltipManager.showTip('mergeShapes');
}, 10);
},
onBeforeActiveTab: function(tab) {
this._state.activeTab = tab;
this.showStaticElements();
},

19
apps/presentationeditor/main/app/view/RightMenu.js
View File

@ -38,6 +38,7 @@
var SCALE_MIN = 40;
var MENU_SCALE_PART = 260;
var MENU_BASE_WIDTH = 220;
define([
'text!presentationeditor/main/app/template/RightMenu.template',
@ -159,15 +160,21 @@ define([
this.defaultHideRightMenu = !(mode.customization && (mode.customization.hideRightMenu===false));
var open = !Common.localStorage.getBool("pe-hide-right-settings", this.defaultHideRightMenu);
Common.Utils.InternalSettings.set("pe-hide-right-settings", !open);
el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
el.show();
Common.NotificationCenter.on('app:repaint', function() {
el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
});
Common.NotificationCenter.on('uitheme:changed', _.bind(function() {
this.updateWidth();
Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
}, this));
el.html(this.template({scope: this}));
this.updateWidth();
el.show();
this.btnMoreContainer = $('#slot-right-menu-more');
Common.UI.SideMenu.prototype.render.call(this);
this.btnMore.menu.menuAlign = 'tr-tl';
@ -338,6 +345,14 @@ define([
Common.UI.SideMenu.prototype.setButtons.apply(this, [allButtons]);
},
updateWidth: function() {
var pane = $(this.el).find('.right-panel'),
paddings = parseInt(pane.css('padding-left')) + parseInt(pane.css('padding-right'));
pane.css('width', MENU_BASE_WIDTH + paddings + 'px');
MENU_SCALE_PART = SCALE_MIN + MENU_BASE_WIDTH + paddings;
this.$el.css('width', (!Common.Utils.InternalSettings.get("pe-hide-right-settings") ? MENU_SCALE_PART : SCALE_MIN) + 'px');
},
txtParagraphSettings: 'Text Settings',
txtImageSettings: 'Image Settings',
txtTableSettings: 'Table Settings',

11
apps/presentationeditor/main/index.html
View File

@ -105,16 +105,6 @@
opacity: 0.4;
}
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 20px;
height: 20px;
border-radius: 20px;
/* margin: 0 10px; */
background: rgba(0,0,0,.15);
background: var(--sk-background-toolbar-tab);
}
.loadmask > .sktoolbar {
background: #f1f1f1;
/*height: 66px;*/
@ -344,7 +334,6 @@
<div class="brendpanel" style="display: none;">
<div>
<div class="spacer"></div>
<div class="circle"></div>
</div>
<div>
<span class="rect"></span>

11
apps/presentationeditor/main/index.html.deploy
View File

@ -81,15 +81,6 @@
opacity: 0.4;
}
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 20px;
height: 20px;
border-radius: 20px;
background: rgba(0,0,0,.15);
background: var(--sk-background-toolbar-tab);
}
.loadmask > .sktoolbar {
background: #f1f1f1;
padding: 0;
@ -311,7 +302,7 @@
<script src="../../../../../apps/common/main/lib/util/docserviceworker.js?__inline=true"></script>
<div id="loading-mask" class="loadmask">
<div class="brendpanel" style="display: none;">
<div><div class="spacer"></div><div class="circle"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
<div><div class="spacer"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
</div>
<div class="sktoolbar" style="display: none;">
<section class="box-controls">

21
apps/spreadsheeteditor/main/app/view/RightMenu.js
View File

@ -38,6 +38,7 @@
var SCALE_MIN = 40;
var MENU_SCALE_PART = 260;
var MENU_BASE_WIDTH = 220;
define([
'text!spreadsheeteditor/main/app/template/RightMenu.template',
@ -184,16 +185,22 @@ define([
this.defaultHideRightMenu = !(mode.customization && (mode.customization.hideRightMenu===false));
var open = !Common.localStorage.getBool("sse-hide-right-settings", this.defaultHideRightMenu);
Common.Utils.InternalSettings.set("sse-hide-right-settings", !open);
el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
el.css('z-index', 101);
el.show();
Common.NotificationCenter.on('app:repaint', function() {
el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
});
Common.NotificationCenter.on('uitheme:changed', _.bind(function() {
this.updateWidth();
Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
}, this));
el.html(this.template({scope: this}));
this.updateWidth();
el.css('z-index', 101);
el.show();
this.btnMoreContainer = $('#slot-right-menu-more');
Common.UI.SideMenu.prototype.render.call(this);
this.btnMore.menu.menuAlign = 'tr-tl';
@ -373,6 +380,14 @@ define([
Common.UI.SideMenu.prototype.setButtons.apply(this, [allButtons]);
},
updateWidth: function() {
var pane = $(this.el).find('.right-panel'),
paddings = parseInt(pane.css('padding-left')) + parseInt(pane.css('padding-right'));
pane.css('width', MENU_BASE_WIDTH + paddings + 'px');
MENU_SCALE_PART = SCALE_MIN + MENU_BASE_WIDTH + paddings;
this.$el.css('width', (!Common.Utils.InternalSettings.get("sse-hide-right-settings") ? MENU_SCALE_PART : SCALE_MIN) + 'px');
},
txtParagraphSettings: 'Paragraph Settings',
txtImageSettings: 'Image Settings',
txtShapeSettings: 'Shape Settings',

11
apps/spreadsheeteditor/main/index.html
View File

@ -109,16 +109,6 @@
opacity: 0.4;
}
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 20px;
height: 20px;
border-radius: 20px;
/* margin: 0 10px; */
background: rgba(0,0,0,.15);
background: var(--sk-background-toolbar-tab);
}
.loadmask > .sktoolbar {
background: #f1f1f1;
padding: 0;
@ -381,7 +371,6 @@
<div class="brendpanel" style="display: none;">
<div>
<div class="spacer"></div>
<div class="circle"></div>
</div>
<div>
<span class="rect"></span>

11
apps/spreadsheeteditor/main/index.html.deploy
View File

@ -86,15 +86,6 @@
opacity: 0.4;
}
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 20px;
height: 20px;
border-radius: 20px;
background: rgba(0,0,0,.15);
background: var(--sk-background-toolbar-tab);
}
.loadmask > .sktoolbar {
background: #f1f1f1;
padding: 0;
@ -352,7 +343,7 @@
<script src="../../../../../apps/common/main/lib/util/docserviceworker.js?__inline=true"></script>
<div id="loading-mask" class="loadmask">
<div class="brendpanel" style="display: none;"><div>
<div class="spacer"></div><div class="circle"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
<div class="spacer"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
</div>
<div class="sktoolbar" style="display: none;">
<section class="box-controls">

11
apps/visioeditor/main/index.html
View File

@ -121,16 +121,6 @@
opacity: 0.4;
}
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 20px;
height: 20px;
border-radius: 20px;
/* margin: 0 10px; */
background: rgba(0,0,0,.15);
background: var(--sk-background-toolbar-tab);
}
.loadmask > .sktoolbar {
background: #f1f1f1;
/*height: 66px;*/
@ -369,7 +359,6 @@
<div>
<div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo_s.svg"></div>
<div class="spacer"></div>
<div class="circle"></div>
</div>
<div>
<span class="rect"></span>

12
apps/visioeditor/main/index.html.deploy
View File

@ -97,16 +97,6 @@
opacity: 0.4;
}
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 20px;
height: 20px;
border-radius: 20px;
margin: 0 10px;
background: rgba(0,0,0,.15);
background: var(--sk-background-toolbar-tab);
}
.loadmask > .sktoolbar {
background: #f1f1f1;
padding: 0;
@ -335,7 +325,7 @@
<script src="../../../../../apps/common/main/lib/util/docserviceworker.js?__inline=true"></script>
<div id="loading-mask" class="loadmask">
<div class="brendpanel" style="display: none;">
<div><div class="loading-logo"><img src="../../../apps/common/main/resources/img/header/header-logo_s.svg"></div><div class="spacer"></div><div class="circle"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
<div><div class="loading-logo"><img src="../../../apps/common/main/resources/img/header/header-logo_s.svg"></div><div class="spacer"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
</div>
<div class="sktoolbar" style="display: none;">
<section class="box-controls">