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

Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

Browse source
This commit is contained in:
SergeyEzhin 2021-05-28 19:39:27 +03:00
parent 7d92eb8140 268a41410d
commit 8461050b39
6 changed files with 51 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/common/embed/resources/less/common.less
View file

@ -265,7 +265,7 @@
}
// Hover state
&:hover {
&:hover:not(:disabled) {
text-decoration: none;
background-color: @btnColor;
@ -274,7 +274,7 @@
}
}
&:active {
&:active:not(:disabled) {
&, .btn-icon {
background-position-y: -@icon-height !important;
}
@ -295,8 +295,8 @@
}
// Active state
&.active,
&:active {
&.active:not(:disabled),
&:active:not(:disabled) {
outline: none;
border: 1px solid @btnActiveColor;
background-color: @btnActiveColor;
@ -644,7 +644,7 @@
.dropdown {
&.open {
> button {
background-color: @btnActiveColor;
background-color: @btnActiveColor !important;
background-position: -@icon-width*14 -@icon-height;
}
}

21
apps/common/mobile/resources/less/colors-table-dark.less Normal file
View file

@ -0,0 +1,21 @@
:root {
.theme-dark {
--background-primary: #1C1C1E;
--background-secondary: #2C2C2E;
--background-tab-active: #636366;
--text-tertiary: #48484A;
--background-tab-normal: #757575;
--text-normal: #FFF;
--text-secondary: fade(#EBEBF5, 60%);
--text-link: #1976D2;
--text-error: #FF453A;
--background-menu-divider: fade(#545458, 36%);
--brand-word: #208BFF;
--brand-cell: #34C759;
--brand-slide: #FF4A31;
--component-disabled-opacity: .4;
}
}

19
apps/common/mobile/resources/less/colors-table.less Normal file
View file

@ -0,0 +1,19 @@
:root {
--background-primary: #FFF;
--background-secondary: #FFF;
--background-tab-active: #AEAEB2;
--text-tertiary: #C7C7CC;
--background-tab-normal: fade(#FFF, 50%);
--text-normal: #000;
--text-secondary: fade(#3C3C43, 60%);
--text-link: #007AFF;
--text-error: #FF3B30;
--background-menu-divider: fade(#3C3C43, 36%);
--brand-word: #446995;
--brand-cell: #40865C;
--brand-slide: #AA5252;
--component-disabled-opacity: .4;
}

2
apps/documenteditor/mobile/src/less/app.less
View file

@ -3,6 +3,8 @@
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
@import '../../../../common/mobile/resources/less/_mixins.less';
@import '../../../../common/mobile/resources/less/colors-table.less';
@import '../../../../common/mobile/resources/less/colors-table-dark.less';
@import '../../../../common/mobile/resources/less/collaboration.less';
@import '../../../../common/mobile/resources/less/common.less';
@import '../../../../common/mobile/resources/less/common-ios.less';

2
apps/presentationeditor/mobile/src/less/app.less
View file

@ -3,6 +3,8 @@
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
@import '../../../../common/mobile/resources/less/_mixins.less';
@import '../../../../common/mobile/resources/less/colors-table.less';
@import '../../../../common/mobile/resources/less/colors-table-dark.less';
@import '../../../../common/mobile/resources/less/collaboration.less';
@import '../../../../common/mobile/resources/less/common.less';
@import '../../../../common/mobile/resources/less/common-ios.less';

2
apps/spreadsheeteditor/mobile/src/less/app.less
View file

@ -5,6 +5,8 @@
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
@import '../../../../common/mobile/resources/less/_mixins.less';
@import '../../../../common/mobile/resources/less/colors-table.less';
@import '../../../../common/mobile/resources/less/colors-table-dark.less';
@import '../../../../common/mobile/resources/less/collaboration.less';
@import '../../../../common/mobile/resources/less/common.less';
@import '../../../../common/mobile/resources/less/common-ios.less';