Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop
This commit is contained in:
commit
8461050b39
|
@ -265,7 +265,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hover state
|
// Hover state
|
||||||
&:hover {
|
&:hover:not(:disabled) {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: @btnColor;
|
background-color: @btnColor;
|
||||||
|
|
||||||
|
@ -274,7 +274,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&:active {
|
&:active:not(:disabled) {
|
||||||
&, .btn-icon {
|
&, .btn-icon {
|
||||||
background-position-y: -@icon-height !important;
|
background-position-y: -@icon-height !important;
|
||||||
}
|
}
|
||||||
|
@ -295,8 +295,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// Active state
|
// Active state
|
||||||
&.active,
|
&.active:not(:disabled),
|
||||||
&:active {
|
&:active:not(:disabled) {
|
||||||
outline: none;
|
outline: none;
|
||||||
border: 1px solid @btnActiveColor;
|
border: 1px solid @btnActiveColor;
|
||||||
background-color: @btnActiveColor;
|
background-color: @btnActiveColor;
|
||||||
|
@ -644,7 +644,7 @@
|
||||||
.dropdown {
|
.dropdown {
|
||||||
&.open {
|
&.open {
|
||||||
> button {
|
> button {
|
||||||
background-color: @btnActiveColor;
|
background-color: @btnActiveColor !important;
|
||||||
background-position: -@icon-width*14 -@icon-height;
|
background-position: -@icon-width*14 -@icon-height;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
21
apps/common/mobile/resources/less/colors-table-dark.less
Normal file
21
apps/common/mobile/resources/less/colors-table-dark.less
Normal 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
19
apps/common/mobile/resources/less/colors-table.less
Normal 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;
|
||||||
|
}
|
|
@ -3,6 +3,8 @@
|
||||||
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
|
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
|
||||||
|
|
||||||
@import '../../../../common/mobile/resources/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/collaboration.less';
|
||||||
@import '../../../../common/mobile/resources/less/common.less';
|
@import '../../../../common/mobile/resources/less/common.less';
|
||||||
@import '../../../../common/mobile/resources/less/common-ios.less';
|
@import '../../../../common/mobile/resources/less/common-ios.less';
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
|
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
|
||||||
|
|
||||||
@import '../../../../common/mobile/resources/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/collaboration.less';
|
||||||
@import '../../../../common/mobile/resources/less/common.less';
|
@import '../../../../common/mobile/resources/less/common.less';
|
||||||
@import '../../../../common/mobile/resources/less/common-ios.less';
|
@import '../../../../common/mobile/resources/less/common-ios.less';
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
|
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
|
||||||
|
|
||||||
@import '../../../../common/mobile/resources/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/collaboration.less';
|
||||||
@import '../../../../common/mobile/resources/less/common.less';
|
@import '../../../../common/mobile/resources/less/common.less';
|
||||||
@import '../../../../common/mobile/resources/less/common-ios.less';
|
@import '../../../../common/mobile/resources/less/common-ios.less';
|
||||||
|
|
Loading…
Reference in a new issue