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

Merge pull request #2146 from ONLYOFFICE/fix/bugfix

Browse source 
[PE] Fix  Bug 60210
This commit is contained in:
Julia Radzhabova 2022-12-16 23:30:44 +03:00 committed by GitHub
parent 1b942cf47f 644fe62ab3
commit 0782b56c61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -704,17 +704,22 @@
margin: 0;
-webkit-box-shadow: none;
box-shadow: none;
&:hover {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover;
}
&.active {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed;
}
svg.icon {
fill: @icon-normal-pressed-ie;
fill: @icon-normal-pressed;
&:not(.disabled) {
.item {
&:hover {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover;
}
&.active {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed;
svg.icon {
fill: @icon-normal-pressed-ie;
fill: @icon-normal-pressed;
}
}
}
}

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -746,7 +746,7 @@ define([
this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, {array: [
this.toolbar.btnChangeSlide, this.toolbar.btnPreview, this.toolbar.btnPrint, this.toolbar.btnCopy, this.toolbar.btnCut, this.toolbar.btnSelectAll, this.toolbar.btnPaste,
this.toolbar.btnCopyStyle, this.toolbar.btnInsertTable, this.toolbar.btnInsertChart, this.toolbar.btnInsertSmartArt,
this.toolbar.btnColorSchemas, this.toolbar.btnShapeAlign,
this.toolbar.btnColorSchemas, this.toolbar.btnShapeAlign, this.toolbar.cmbInsertShape,
this.toolbar.btnShapeArrange, this.toolbar.btnSlideSize, this.toolbar.listTheme, this.toolbar.btnEditHeader, this.toolbar.btnInsDateTime, this.toolbar.btnInsSlideNum
]});
this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides,

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

@ -1143,6 +1143,7 @@ define([
dataHintDirection: 'bottom',
dataHintOffset: '-16, 0'
});
this.slideOnlyControls.push(this.cmbInsertShape);
this.lockControls = [this.btnChangeSlide, this.btnSave,
this.btnCopy, this.btnPaste, this.btnCut, this.btnSelectAll,this.btnUndo, this.btnRedo, this.cmbFontName, this.cmbFontSize, this.btnIncFontSize, this.btnDecFontSize,
@ -1150,7 +1151,7 @@ define([
this.btnSubscript, this.btnFontColor, this.btnClearStyle, this.btnCopyStyle, this.btnMarkers,
this.btnNumbers, this.btnDecLeftOffset, this.btnIncLeftOffset, this.btnLineSpace, this.btnHorizontalAlign, this.btnColumns,
this.btnVerticalAlign, this.btnShapeArrange, this.btnShapeAlign, this.btnInsertTable, this.btnInsertChart, this.btnInsertSmartArt,
this.btnInsertEquation, this.btnInsertSymbol, this.btnInsertHyperlink, this.btnColorSchemas, this.btnSlideSize, this.listTheme, this.mnuShowSettings
this.btnInsertEquation, this.btnInsertSymbol, this.btnInsertHyperlink, this.btnColorSchemas, this.btnSlideSize, this.listTheme, this.mnuShowSettings, this.cmbInsertShape
];
// Disable all components before load document