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

Merge pull request #820 from ONLYOFFICE/feature/pr20-fix-bug-49741

Browse source 
Feature/pr20 fix bug 49741
This commit is contained in:
maxkadushkin 2021-04-20 17:06:02 +03:00 committed by GitHub
parent 41097a321d f3b6156ec8
commit b90fecb84c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -523,7 +523,7 @@
box-shadow: inset 0 0 0 @scaled-one-px-value @border-regular-control; box-shadow: inset 0 0 0 @scaled-one-px-value @border-regular-control;
} }
&, .icon { & {
width: 21px; width: 21px;
height: 21px; height: 21px;
} }

2
apps/documenteditor/main/app/view/ListSettingsDialog.js
View file

@ -131,7 +131,7 @@ define([
'</td>', '</td>',
'<td>', '<td>',
'<label>' + this.textPreview + '</label>', '<label>' + this.textPreview + '</label>',
'<div id="bulleted-list-preview" style="margin-top: 2px; height:208px; width: 100%; border: 1px solid #cfcfcf;"></div>', '<div id="bulleted-list-preview"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'</table>', '</table>',

9
apps/documenteditor/main/resources/less/advanced-settings.less
View file

@ -61,4 +61,11 @@
background-color: #fff; background-color: #fff;
} }
#bulleted-list-preview {
margin-top: 2px;
height:208px;
width: 100%;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control;
background-color: @canvas-content-background;
}

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

@ -214,6 +214,8 @@
.menu-list-preview { .menu-list-preview {
.box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie);
.box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
background-color: @canvas-content-background;
} }
a:hover { a:hover {