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

Merge pull request #837 from ONLYOFFICE/feature/pr22-fix-bug-49886

Browse source 
Feature/pr22 fix bug 49886
This commit is contained in:
maxkadushkin 2021-04-24 23:40:20 +03:00 committed by GitHub
parent c9ef92f3f5 a1c9daae8e
commit 8fd95b5aaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 120 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/common/main/lib/controller/Themes.js
View file

@ -61,6 +61,9 @@ define([
"text-secondary", "text-secondary",
"text-tertiary", "text-tertiary",
"text-link", "text-link",
"text-link-hover",
"text-link-active",
"text-link-visited",
"text-inverse", "text-inverse",
"text-toolbar-header", "text-toolbar-header",
"text-contrast-background", "text-contrast-background",
@ -206,7 +209,7 @@ define([
}) })
this.api = api; this.api = api;
var theme_name = Common.localStorage.getItem('ui-theme', id_default_light_theme); var theme_name = Common.localStorage.getItem('ui-theme') || id_default_light_theme;
if ( !$('body').hasClass(theme_name) ) { if ( !$('body').hasClass(theme_name) ) {
$('body').addClass(theme_name); $('body').addClass(theme_name);

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

@ -39,6 +39,9 @@
--text-secondary: #a5a5a5; --text-secondary: #a5a5a5;
--text-tertiary: #a5a5a5; --text-tertiary: #a5a5a5;
--text-link: #acbfff; --text-link: #acbfff;
--text-link-hover: #acbfff;
--text-link-active: #acbfff;
--text-link-visited: #acbfff;
--text-inverse: #fff; --text-inverse: #fff;
--text-toolbar-header: #fff; --text-toolbar-header: #fff;
--text-contrast-background: #fff; --text-contrast-background: #fff;
@ -54,7 +57,7 @@
// Canvas colors // Canvas colors
--canvas-background: #e2e2e2; --canvas-background: #e2e2e2;
--canvas-content-background: #fff; --canvas-content-background: #fff;
--canvas-page-border: #555; --canvas-page-border: #ccc;
--canvas-ruler-background: #555; --canvas-ruler-background: #555;
--canvas-ruler-margins-background: #444; --canvas-ruler-margins-background: #444;
@ -116,6 +119,11 @@
--component-active-hover-icon-opacity: .8; --component-active-hover-icon-opacity: .8;
--component-disabled-opacity: .3; --component-disabled-opacity: .3;
--header-component-normal-icon-opacity: 1;
--header-component-hover-icon-opacity: 1;
--header-component-active-icon-opacity: 1;
--header-component-active-hover-icon-opacity: 1;
--menu-icon-item-checked-offset-x: -20px; --menu-icon-item-checked-offset-x: -20px;
} }
} }

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

@ -39,6 +39,9 @@
--text-secondary: fade(#fff, 60%); --text-secondary: fade(#fff, 60%);
--text-tertiary: fade(#fff, 40%); --text-tertiary: fade(#fff, 40%);
--text-link: #b5e4ff; --text-link: #b5e4ff;
--text-link-hover: #b5e4ff;
--text-link-active: #b5e4ff;
--text-link-visited: #b5e4ff;
--text-inverse: #333; --text-inverse: #333;
--text-toolbar-header: fade(#fff, 80%); --text-toolbar-header: fade(#fff, 80%);
--text-contrast-background: #fff; --text-contrast-background: #fff;
@ -116,6 +119,11 @@
--component-active-hover-icon-opacity: 1; --component-active-hover-icon-opacity: 1;
--component-disabled-opacity: .3; --component-disabled-opacity: .3;
--header-component-normal-icon-opacity: .8;
--header-component-hover-icon-opacity: .8;
--header-component-active-icon-opacity: 1;
--header-component-active-hover-icon-opacity: 1;
--menu-icon-item-checked-offset-x: -20px; --menu-icon-item-checked-offset-x: -20px;
} }
} }

48
apps/common/main/resources/less/colors-table-ie-fix.less
View file

@ -4,50 +4,50 @@
@toolbar-header-presentation-ie: #aa5252; @toolbar-header-presentation-ie: #aa5252;
@background-normal-ie: #fff; @background-normal-ie: #fff;
@background-toolbar-ie: #f7f7f7; @background-toolbar-ie: #f1f1f1;
@background-toolbar-additional-ie: #efefef; @background-toolbar-additional-ie: #f1f1f1;
@background-primary-dialog-button-ie: #444; @background-primary-dialog-button-ie: #7d858c;
@background-tab-underline-ie: #444; @background-tab-underline-ie: #444;
@background-notification-popover-ie: #fcfed7; @background-notification-popover-ie: #fcfed7;
@background-notification-badge-ie: #ffd112; @background-notification-badge-ie: #ffd112;
@background-scrim-ie: fade(#000, 20%); @background-scrim-ie: fade(#000, 20%);
@background-loader-ie: fade(#181818, 90%); @background-loader-ie: fade(#000, 65%);
@highlight-button-hover-ie: #e0e0e0; @highlight-button-hover-ie: #d8dadc;
@highlight-button-pressed-ie: #ccc; @highlight-button-pressed-ie: #7d858c;
@highlight-button-pressed-hover-ie: #bababa; @highlight-button-pressed-hover-ie: #7d858c;
@highlight-primary-dialog-button-hover-ie: #2b2b2b; @highlight-primary-dialog-button-hover-ie: #666d73;
@highlight-header-button-hover-ie: fade(#fff, 20%); @highlight-header-button-hover-ie: fade(#fff, 20%);
@highlight-header-button-pressed-ie: fade(#fff, 25%); @highlight-header-button-pressed-ie: fade(#000, 20%);
@highlight-toolbar-tab-underline-ie: #444; @highlight-toolbar-tab-underline-ie: #444;
@highlight-text-select-ie: #3494fb; @highlight-text-select-ie: #3494fb;
@border-toolbar-ie: #cbcbcb; @border-toolbar-ie: #cbcbcb;
@border-divider-ie: #dfdfdf; @border-divider-ie: #cbcbcb;
@border-regular-control-ie: #c0c0c0; @border-regular-control-ie: #cfcfcf;
@border-toolbar-button-hover-ie: #e0e0e0; @border-toolbar-button-hover-ie: #d8dadc;
@border-preview-hover-ie: #cfcfcf; @border-preview-hover-ie: #cfcfcf;
@border-preview-select-ie: #aaa; @border-preview-select-ie: #848484;
@border-control-focus-ie: #848484; @border-control-focus-ie: #848484;
@border-color-shading-ie: fade(#000, 10%); @border-color-shading-ie: fade(#000, 20%);
@border-error-ie: #f62211; @border-error-ie: #d9534f;
@text-normal-ie: fade(#000, 80%); @text-normal-ie: #444;
@text-normal-pressed-ie: fade(#000, 80%); @text-normal-pressed-ie: #fff;
@text-secondary-ie: fade(#000, 60%); @text-secondary-ie: #a5a5a5;
@text-tertiary-ie: fade(#000, 40%); @text-tertiary-ie: #a5a5a5;
@text-link-ie: #445799; @text-link-ie: #acbfff;
@text-inverse-ie: #fff; @text-inverse-ie: #fff;
@text-toolbar-header-ie: #fff; @text-toolbar-header-ie: #fff;
@text-contrast-background-ie: #fff; @text-contrast-background-ie: #fff;
@icon-normal-ie: #444; @icon-normal-ie: #444;
@icon-normal-pressed-ie: #444; @icon-normal-pressed-ie: #fff;
@icon-inverse-ie: #fff; @icon-inverse-ie: #444;
@icon-toolbar-header-ie: #fff; @icon-toolbar-header-ie: fade(#fff, 80%);
@icon-notification-badge-ie: #000; @icon-notification-badge-ie: #000;
@icon-contrast-popover-ie: #fff; @icon-contrast-popover-ie: #fff;
@icon-success-ie: #090; @icon-success-ie: #5b9f27;
@button-header-normal-icon-offset-x-ie: -20px; @button-header-normal-icon-offset-x-ie: -20px;
@button-header-active-icon-offset-x-ie: -20px; @button-header-active-icon-offset-x-ie: -20px;

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

@ -49,6 +49,9 @@
--text-secondary: fade(#000, 60%); --text-secondary: fade(#000, 60%);
--text-tertiary: fade(#000, 40%); --text-tertiary: fade(#000, 40%);
--text-link: #445799; --text-link: #445799;
--text-link-hover: #445799;
--text-link-active: #445799;
--text-link-visited: #445799;
--text-inverse: #fff; --text-inverse: #fff;
--text-toolbar-header: #fff; --text-toolbar-header: #fff;
--text-contrast-background: #fff; --text-contrast-background: #fff;
@ -127,6 +130,11 @@
--component-active-icon-opacity: 1; --component-active-icon-opacity: 1;
--component-active-hover-icon-opacity: 1; --component-active-hover-icon-opacity: 1;
--component-disabled-opacity: .4; --component-disabled-opacity: .4;
--header-component-normal-icon-opacity: 1;
--header-component-hover-icon-opacity: 1;
--header-component-active-icon-opacity: 1;
--header-component-active-hover-icon-opacity: 1;
//--button-icon-opacity: 1; //--button-icon-opacity: 1;
} }
@ -172,6 +180,9 @@
@text-secondary: var(--text-secondary); @text-secondary: var(--text-secondary);
@text-tertiary: var(--text-tertiary); @text-tertiary: var(--text-tertiary);
@text-link: var(--text-link); @text-link: var(--text-link);
@text-link-hover: var(--text-link-hover);
@text-link-active: var(--text-link-active);
@text-link-visited: var(--text-link-visited);
@text-inverse: var(--text-inverse); @text-inverse: var(--text-inverse);
@text-toolbar-header: var(--text-toolbar-header); @text-toolbar-header: var(--text-toolbar-header);
@text-contrast-background: var(--text-contrast-background); @text-contrast-background: var(--text-contrast-background);
@ -207,6 +218,11 @@
@component-disabled-opacity: var(--component-disabled-opacity, .4); @component-disabled-opacity: var(--component-disabled-opacity, .4);
//@button-icon-opacity: var(--button-icon-opacity, 1); //@button-icon-opacity: var(--button-icon-opacity, 1);
@header-component-normal-icon-opacity: var(--header-component-normal-icon-opacity, 1);
@header-component-hover-icon-opacity: var(--header-component-hover-icon-opacity, 1);
@header-component-active-icon-opacity: var(--header-component-active-icon-opacity, 1);
@header-component-active-hover-icon-opacity: var(--header-component-active-hover-icon-opacity, 1);
@menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0); @menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0);
// Canvas // Canvas

9
apps/common/main/resources/less/combo-border-size.less
View file

@ -3,6 +3,13 @@
cursor: pointer; cursor: pointer;
} }
&.input-group-nr {
.form-control:not(input) {
padding-top: 0;
padding-bottom: 0;
}
}
li { li {
a { a {
white-space: normal; white-space: normal;
@ -28,7 +35,7 @@
height: 100%; height: 100%;
display: inline-block; display: inline-block;
background-color: transparent; background-color: transparent;
margin: -1px 0 0 -3px; margin: 0 0 0 -3px;
} }
img, .image { img, .image {

11
apps/common/main/resources/less/header.less
View file

@ -327,13 +327,24 @@
} }
.btn& { .btn& {
&:not(:disabled) .icon {
opacity: @header-component-normal-icon-opacity;
}
&:active, &.active { &:active, &.active {
.icon.toolbar__icon { .icon.toolbar__icon {
&.icon--inverse { &.icon--inverse {
background-position-x: @button-header-active-icon-offset-x-ie; background-position-x: @button-header-active-icon-offset-x-ie;
opacity: @header-component-active-icon-opacity;
} }
} }
} }
&:hover:not(:disabled) {
.icon {
opacity: @header-component-hover-icon-opacity;
}
}
} }
svg.icon { svg.icon {

2
apps/common/main/resources/less/multislider-gradient.less
View file

@ -3,6 +3,8 @@
background-color: transparent; background-color: transparent;
.thumb { .thumb {
width: 13px;
height: 15px;
top: 18px; top: 18px;
background: none; background: none;

10
apps/common/main/resources/less/synchronize-tip.less
View file

@ -360,6 +360,16 @@
color: @text-link-ie; color: @text-link-ie;
color: @text-link; color: @text-link;
cursor: pointer; cursor: pointer;
&:hover:not(:disabled) {
color: @text-link-hover;
border-bottom-color: dotted @text-link-hover;
}
&:active {
color: @text-link-active;
border-bottom-color: dotted @text-link-hover;
}
} }
.asc-synchronizetip .close { .asc-synchronizetip .close {

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

@ -527,6 +527,11 @@
width: 21px; width: 21px;
height: 21px; height: 21px;
} }
.icon {
width: 22px;
height: 22px;
}
} }
} }

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

@ -469,7 +469,7 @@ define([
this.mnuTableTemplatePicker.selectRecord(rec, true); this.mnuTableTemplatePicker.selectRecord(rec, true);
this.btnTableTemplate.resumeEvents(); this.btnTableTemplate.resumeEvents();
this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'cover'}); this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'auto 50px'});
this._state.TemplateId = value; this._state.TemplateId = value;
} }

8
apps/documenteditor/main/index.html
View file

@ -14,12 +14,16 @@
--toolbar-header-document: #2a2a2a; --toolbar-header-document: #2a2a2a;
--background-toolbar: #404040; --background-toolbar: #404040;
--border-toolbar: #2a2a2a; --border-toolbar: #2a2a2a;
--highlight-button-pressed: #606060; --highlight-button-hover: #e0e0e0;
--canvas-background: #666666; --canvas-background: #666666;
/*--canvas-content-background: #fff;*/ /*--canvas-content-background: #fff;*/
--canvas-page-border: #555; --canvas-page-border: #555;
} }
.theme-classic-light {
--highlight-button-hover: #d8dadc;
}
.loadmask { .loadmask {
left: 0; left: 0;
top: 0; top: 0;
@ -91,7 +95,7 @@
.loadmask > .sktoolbar li { .loadmask > .sktoolbar li {
background: #ccc; background: #ccc;
background: var(--highlight-button-pressed, #ccc); background: var(--highlight-button-hover, #ccc);
border-radius: 3px; border-radius: 3px;
width: 20px; width: 20px;
height: 20px; height: 20px;

2
apps/documenteditor/main/index.html.deploy
View file

@ -82,7 +82,7 @@
.loadmask > .sktoolbar li { .loadmask > .sktoolbar li {
background: #ccc; background: #ccc;
background: var(--highlight-button-pressed, #ccc); background: var(--highlight-button-hover, #ccc);
border-radius: 3px; border-radius: 3px;
width: 20px; width: 20px;
height: 20px; height: 20px;

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

@ -437,7 +437,7 @@ define([
this.mnuTableTemplatePicker.selectRecord(rec, true); this.mnuTableTemplatePicker.selectRecord(rec, true);
this.btnTableTemplate.resumeEvents(); this.btnTableTemplate.resumeEvents();
this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'cover'}); this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'auto 50px'});
this._state.TemplateId = value; this._state.TemplateId = value;
} }

8
apps/presentationeditor/main/index.html
View file

@ -13,12 +13,16 @@
--toolbar-header-presentation: #2a2a2a; --toolbar-header-presentation: #2a2a2a;
--background-toolbar: #404040; --background-toolbar: #404040;
--border-toolbar: #2a2a2a; --border-toolbar: #2a2a2a;
--highlight-button-pressed: #606060; --highlight-button-hover: #606060;
--canvas-background: #666666; --canvas-background: #666666;
/*--canvas-content-background: #fff;*/ /*--canvas-content-background: #fff;*/
--canvas-page-border: #555; --canvas-page-border: #555;
} }
.theme-classic-light {
--highlight-button-hover: #d8dadc;
}
.loadmask { .loadmask {
left: 0; left: 0;
top: 0; top: 0;
@ -90,7 +94,7 @@
.loadmask > .sktoolbar li { .loadmask > .sktoolbar li {
background: #ccc; background: #ccc;
background: var(--highlight-button-pressed, #ccc); background: var(--highlight-button-hover, #ccc);
border-radius: 3px; border-radius: 3px;
width: 20px; width: 20px;
height: 20px; height: 20px;

2
apps/presentationeditor/main/index.html.deploy
View file

@ -82,7 +82,7 @@
.loadmask > .sktoolbar li { .loadmask > .sktoolbar li {
background: #ccc; background: #ccc;
background: var(--highlight-button-pressed, #ccc); background: var(--highlight-button-hover, #ccc);
border-radius: 3px; border-radius: 3px;
width: 20px; width: 20px;
height: 20px; height: 20px;

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

@ -452,7 +452,7 @@ define([
this.mnuTableTemplatePicker.selectRecord(rec, true); this.mnuTableTemplatePicker.selectRecord(rec, true);
this.btnTableTemplate.resumeEvents(); this.btnTableTemplate.resumeEvents();
this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '48px', 'width': '63px', 'background-position': 'center', 'background-size': 'cover'}); this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '48px', 'width': '63px', 'background-position': 'center', 'background-size': 'auto 50px'});
this._state.TemplateName=value; this._state.TemplateName=value;
} }

6
apps/spreadsheeteditor/main/index.html
View file

@ -13,12 +13,16 @@
--background-toolbar: #404040; --background-toolbar: #404040;
--background-normal: #333; --background-normal: #333;
--border-toolbar: #2a2a2a; --border-toolbar: #2a2a2a;
--highlight-button-pressed: #606060; --highlight-button-hover: #606060;
--canvas-background: #666666; --canvas-background: #666666;
/*--canvas-content-background: #fff;*/ /*--canvas-content-background: #fff;*/
--canvas-page-border: #555; --canvas-page-border: #555;
} }
.theme-classic-light {
--highlight-button-hover: #d8dadc;
}
.loadmask { .loadmask {
left: 0; left: 0;
top: 0; top: 0;

2
apps/spreadsheeteditor/main/index.html.deploy
View file

@ -79,7 +79,7 @@
.loadmask > .sktoolbar li { .loadmask > .sktoolbar li {
background: #ccc; background: #ccc;
background: var(--highlight-button-pressed, #ccc); background: var(--highlight-button-hover, #ccc);
border-radius: 3px; border-radius: 3px;
width: 20px; width: 20px;
height: 20px; height: 20px;