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

Merge pull request #812 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-04-15 16:44:32 +03:00 committed by GitHub
parent 2eb8cd360a 785cfb49e5
commit e403257024
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/common/main/resources/less/buttons.less
View file

@ -186,8 +186,8 @@
&.active:not(.disabled) { &.active:not(.disabled) {
.caret-up, .caret-down { .caret-up, .caret-down {
&::after { &::after {
border-color: @background-normal-ie; border-color: @text-normal-pressed-ie;
border-color: @background-normal; border-color: @text-normal-pressed;
} }
} }
@ -331,8 +331,14 @@
.btn.small; .btn.small;
&.bg-white { &.bg-white {
width: 22px;
height: 22px;
background-color: @background-normal-ie; background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small);
} }
&:before, &:before,

2
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -2101,7 +2101,7 @@ define([
store : PE.getCollection('SlideLayouts'), store : PE.getCollection('SlideLayouts'),
itemTemplate: _.template([ itemTemplate: _.template([
'<div class="layout" id="<%= id %>" style="width: <%= itemWidth %>px;">', '<div class="layout" id="<%= id %>" style="width: <%= itemWidth %>px;">',
'<div style="background-image: url(<%= imageUrl %>); width: <%= itemWidth %>px; height: <%= itemHeight %>px;"></div>', '<div style="background-image: url(<%= imageUrl %>); width: <%= itemWidth %>px; height: <%= itemHeight %>px;background-size: contain;"></div>',
'<div class="title"><%= title %></div> ', '<div class="title"><%= title %></div> ',
'</div>' '</div>'
].join('')) ].join(''))

4
apps/spreadsheeteditor/main/app/template/SortDialog.template
View file

@ -6,8 +6,8 @@
<button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-add"><%= scope.textAdd %></button> <button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-add"><%= scope.textAdd %></button>
<button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-delete"><%= scope.textDelete %></button> <button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-delete"><%= scope.textDelete %></button>
<button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-copy"><%= scope.textCopy %></button> <button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-copy"><%= scope.textCopy %></button>
<div id="sort-dialog-btn-up" class="sort-dialog-btn-caret"></div> <div id="sort-dialog-btn-up" style="display: inline-block;"></div>
<div id="sort-dialog-btn-down" class="sort-dialog-btn-caret"></div> <div id="sort-dialog-btn-down" style="display: inline-block;"></div>
<button type="button" class="btn btn-text-default" id="sort-dialog-btn-options" style="min-width: 100px;"><%= scope.textOptions %></button> <button type="button" class="btn btn-text-default" id="sort-dialog-btn-options" style="min-width: 100px;"><%= scope.textOptions %></button>
</td> </td>
</tr> </tr>

8
apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
View file

@ -85,8 +85,8 @@ define([
'<button type="button" class="btn btn-text-default auto" id="chart-dlg-btn-edit" style="min-width: 70px;margin-right:5px;">', me.textEdit, '</button>', '<button type="button" class="btn btn-text-default auto" id="chart-dlg-btn-edit" style="min-width: 70px;margin-right:5px;">', me.textEdit, '</button>',
'<button type="button" class="btn btn-text-default auto" id="chart-dlg-btn-delete" style="min-width: 70px;margin-right:5px;">', me.textDelete, '</button>', '<button type="button" class="btn btn-text-default auto" id="chart-dlg-btn-delete" style="min-width: 70px;margin-right:5px;">', me.textDelete, '</button>',
'<div style="display: inline-block; float: right;">', '<div style="display: inline-block; float: right;">',
'<div id="chart-dlg-btn-up" style="display: inline-block;border: 1px solid #cfcfcf;border-radius: 1px;margin-right: 2px;"></div>', '<div id="chart-dlg-btn-up" style="display: inline-block;margin-right: 2px;"></div>',
'<div id="chart-dlg-btn-down" style="display: inline-block;border: 1px solid #cfcfcf;border-radius: 1px;"></div>', '<div id="chart-dlg-btn-down" style="display: inline-block;"></div>',
'</div>', '</div>',
'</td>', '</td>',
'</tr>', '</tr>',
@ -175,7 +175,7 @@ define([
this.btnUp = new Common.UI.Button({ this.btnUp = new Common.UI.Button({
parentEl: $('#chart-dlg-btn-up'), parentEl: $('#chart-dlg-btn-up'),
cls: 'btn-toolbar', cls: 'btn-toolbar bg-white',
iconCls: 'caret-up', iconCls: 'caret-up',
hint: this.textUp hint: this.textUp
}); });
@ -183,7 +183,7 @@ define([
this.btnDown = new Common.UI.Button({ this.btnDown = new Common.UI.Button({
parentEl: $('#chart-dlg-btn-down'), parentEl: $('#chart-dlg-btn-down'),
cls: 'btn-toolbar', cls: 'btn-toolbar bg-white',
iconCls: 'caret-down', iconCls: 'caret-down',
hint: this.textDown hint: this.textDown
}); });

4
apps/spreadsheeteditor/main/app/view/SortDialog.js
View file

@ -177,7 +177,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
this.btnUp = new Common.UI.Button({ this.btnUp = new Common.UI.Button({
parentEl: $('#sort-dialog-btn-up'), parentEl: $('#sort-dialog-btn-up'),
cls: 'btn-toolbar', cls: 'btn-toolbar bg-white',
iconCls: 'caret-up', iconCls: 'caret-up',
hint: this.textUp hint: this.textUp
}); });
@ -185,7 +185,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
this.btnDown = new Common.UI.Button({ this.btnDown = new Common.UI.Button({
parentEl: $('#sort-dialog-btn-down'), parentEl: $('#sort-dialog-btn-down'),
cls: 'btn-toolbar', cls: 'btn-toolbar bg-white',
iconCls: 'caret-down', iconCls: 'caret-down',
hint: this.textDown hint: this.textDown
}); });

2
apps/spreadsheeteditor/main/app/view/Spellcheck.js
View file

@ -89,7 +89,7 @@ define([
this.buttonNext = new Common.UI.Button({ this.buttonNext = new Common.UI.Button({
parentEl: $('#spellcheck-next'), parentEl: $('#spellcheck-next'),
style: 'margin-left: 5px; width: 22px; height: 22px; border: 1px solid #cfcfcf;', style: 'margin-left: 5px;',
cls: 'btn-toolbar bg-white', cls: 'btn-toolbar bg-white',
iconCls: 'toolbar__icon btn-nextitem', iconCls: 'toolbar__icon btn-nextitem',
hint: this.txtNextTip hint: this.txtNextTip

7
apps/spreadsheeteditor/main/resources/less/advanced-settings.less
View file

@ -90,13 +90,6 @@
} }
} }
.sort-dialog-btn-caret {
display: inline-block;
border: @scaled-one-px-value-ie solid #cfcfcf;
border: @scaled-one-px-value solid #cfcfcf;
border-radius: 1px;
}
#sort-dialog-btn-down { #sort-dialog-btn-down {
margin-right: 5px; margin-right: 5px;
} }

3
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file

@ -196,8 +196,7 @@
color: @text-normal-pressed; color: @text-normal-pressed;
.settings-icon { .settings-icon {
background-position-x: -20px; background-position-x: @button-small-active-icon-offset-x;
--bgX: -20px;
} }
} }
} }