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

[dark theme] correct some components

Browse source
This commit is contained in:
Maxim Kadushkin 2021-02-18 00:27:58 +03:00
parent 86a441c3a3
commit 1fed5dc207
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,8 +61,20 @@ define([
var classname = document.documentElement.className.replace(/theme-\w+\s?/, ''); var classname = document.documentElement.className.replace(/theme-\w+\s?/, '');
document.body.className = classname; document.body.className = classname;
this.api.asc_setSkin(sdk_themes_relation[name]);
$('body').addClass(name); $('body').addClass(name);
this.api.asc_setSkin(sdk_themes_relation[name]);
var style = getComputedStyle(document.body);
if ( !!window.DE ) {
var color_background_normal = style.getPropertyValue('--background-normal');
this.api.asc_setSkin({
"RulerOutline": style.getPropertyValue('--border-toolbar')
, "RulerMarkersFillColor": color_background_normal
, "RulerMarkersFillColorOld": color_background_normal
, "RulerTableColor1": color_background_normal
});
}
Common.localStorage.setItem('ui-theme', name); Common.localStorage.setItem('ui-theme', name);
Common.NotificationCenter.trigger('uitheme:change', name); Common.NotificationCenter.trigger('uitheme:change', name);
} }

2
apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
View file

@ -32,6 +32,6 @@
.toolbar__icon-big.{{name}} .toolbar__icon-big.{{name}}
{ {
background-position: 0 {{px.offset_y}}; background-position: 0 {{px.offset_y}};
background-position: var(--button-huge-normal-icon-offset-x,0) {{px.offset_y}}; background-position: var(--button-xhuge-normal-icon-offset-x,0) {{px.offset_y}};
} }
{{/sprites}} {{/sprites}}

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

@ -406,7 +406,7 @@
// TODO: move to appropriate module // TODO: move to appropriate module
.btn-header, .btn-users { .btn-header, .btn-users {
&:not(:active) .icon--inverse { &:not(:active) .icon--inverse {
background-position-x: 0; background-position-x: @button-small-normal-icon-offset-x;
} }
svg.icon { svg.icon {