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

Merge pull request #759 from ONLYOFFICE/feature/pr5-fix-bug-49252

Browse source 
Feature/pr5 fix bug 49252
This commit is contained in:
maxkadushkin 2021-03-28 01:34:37 +03:00 committed by GitHub
parent c0efac841b a2c14d92e5
commit 9e49bfa58c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/resources/less/colors-table-dark.less
View file

@ -31,7 +31,7 @@
--border-preview-hover: #e0e0e0; --border-preview-hover: #e0e0e0;
--border-preview-select: #666666; --border-preview-select: #666666;
--border-control-focus: #ccc; --border-control-focus: #ccc;
--border-color-shading: fade(#fff, 5%); --border-color-shading: fade(#fff, 15%);
--border-error: #f62211; --border-error: #f62211;
--text-normal: fade(#fff, 80%); --text-normal: fade(#fff, 80%);

2
apps/common/main/resources/less/colors-table.less
View file

@ -41,7 +41,7 @@
--border-preview-hover: #cfcfcf; --border-preview-hover: #cfcfcf;
--border-preview-select: #aaa; --border-preview-select: #aaa;
--border-control-focus: #848484; --border-control-focus: #848484;
--border-color-shading: fade(#000, 10%); --border-color-shading: fade(#000, 15%);
--border-error: #f62211; --border-error: #f62211;
--text-normal: fade(#000, 80%); --text-normal: fade(#000, 80%);

4
apps/common/main/resources/less/common.less
View file

@ -266,3 +266,7 @@ textarea {
background-position-x: -56px; background-position-x: -56px;
} }
} }
.doc-content-color {
background-color: @canvas-content-background;
}

1
apps/common/main/resources/less/extended-color-picker.less
View file

@ -31,6 +31,7 @@
input { input {
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
background-color: @background-normal;
} }
.color-cnt { .color-cnt {

2
apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template
View file

@ -147,7 +147,7 @@
<div id="paragraphadv-spin-position"></div> <div id="paragraphadv-spin-position"></div>
</div> </div>
</div> </div>
<div style="outline: 1px solid #cbcbcb;"> <div class="doc-content-color" style="outline: 1px solid #cbcbcb;">
<div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div> <div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div>
</div> </div>
</div> </div>

2
apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
View file

@ -78,7 +78,7 @@
<div id="paragraphadv-spin-spacing"></div> <div id="paragraphadv-spin-spacing"></div>
</div> </div>
</div> </div>
<div style="border: 1px solid #cbcbcb;"> <div class="doc-content-color" style="border: 1px solid #cbcbcb;">
<div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div> <div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div>
</div> </div>
</div> </div>

2
apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template
View file

@ -78,7 +78,7 @@
<div id="paragraphadv-spin-spacing"></div> <div id="paragraphadv-spin-spacing"></div>
</div> </div>
</div> </div>
<div style="border: 1px solid #cbcbcb;"> <div class="doc-content-color" style="border: 1px solid #cbcbcb;">
<div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div> <div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div>
</div> </div>
</div> </div>