diff --git a/apps/common/embed/resources/less/common.less b/apps/common/embed/resources/less/common.less index 32bcb4db1..5eae33403 100644 --- a/apps/common/embed/resources/less/common.less +++ b/apps/common/embed/resources/less/common.less @@ -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; } } diff --git a/apps/common/mobile/resources/less/colors-table-dark.less b/apps/common/mobile/resources/less/colors-table-dark.less new file mode 100644 index 000000000..b788bc7bd --- /dev/null +++ b/apps/common/mobile/resources/less/colors-table-dark.less @@ -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; + } +} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/colors-table.less b/apps/common/mobile/resources/less/colors-table.less new file mode 100644 index 000000000..a5474ece2 --- /dev/null +++ b/apps/common/mobile/resources/less/colors-table.less @@ -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; +} \ No newline at end of file diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 7ac2df969..959e96f05 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -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'; diff --git a/apps/presentationeditor/mobile/src/less/app.less b/apps/presentationeditor/mobile/src/less/app.less index 96a172f62..cc4000288 100644 --- a/apps/presentationeditor/mobile/src/less/app.less +++ b/apps/presentationeditor/mobile/src/less/app.less @@ -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'; diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less index 1854309e8..5338e8a1f 100644 --- a/apps/spreadsheeteditor/mobile/src/less/app.less +++ b/apps/spreadsheeteditor/mobile/src/less/app.less @@ -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';