From a6b41b9c63bd80eb1fe4640343598a6d784a1a17 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 2 Dec 2021 14:57:27 +0300
Subject: [PATCH] [DE forms] Fix Bug 53788
---
apps/common/main/lib/controller/Themes.js | 1 +
.../resources/less/colors-table-classic.less | 4 +--
.../resources/less/colors-table-dark.less | 2 +-
.../resources/less/colors-table-ie-fix.less | 5 +--
.../main/resources/less/colors-table.less | 6 ++--
.../main/resources/less/synchronize-tip.less | 36 ++++++++++---------
6 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index fe3f6a1a0..175ca5a2f 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -53,6 +53,7 @@ define([
"background-loader",
"background-accent-button",
"background-contrast-popover",
+ "shadow-contrast-popover",
"highlight-button-hover",
"highlight-button-pressed",
diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less
index b2de6d89d..b882f5254 100644
--- a/apps/common/main/resources/less/colors-table-classic.less
+++ b/apps/common/main/resources/less/colors-table-classic.less
@@ -15,7 +15,7 @@
--background-notification-badge: #ffd112;
--background-scrim: fade(#000, 20%);
--background-loader: fade(#000, 65%);
- --background-contrast-popover: #444444;
+ --background-contrast-popover: #fff;
--highlight-button-hover: #d8dadc;
--highlight-button-pressed: #7d858c;
@@ -37,7 +37,7 @@
--border-control-focus: #848484;
--border-color-shading: fade(#000, 20%);
--border-error: #d9534f;
- --border-contrast-popover: #444444;
+ --border-contrast-popover: #fff;
--text-normal: #444;
--text-normal-pressed: #fff;
diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less
index 1e1f358a4..9dc4c765b 100644
--- a/apps/common/main/resources/less/colors-table-dark.less
+++ b/apps/common/main/resources/less/colors-table-dark.less
@@ -9,7 +9,7 @@
--background-toolbar: #404040;
--background-toolbar-additional: #505050;
--background-primary-dialog-button: #ddd;
- --background-accent-button: #6194d0;
+ --background-accent-button: #486F9E;
--background-tab-underline: #ddd;
--background-notification-popover: #3e5968;
--background-notification-badge: #ffd112;
diff --git a/apps/common/main/resources/less/colors-table-ie-fix.less b/apps/common/main/resources/less/colors-table-ie-fix.less
index f9917964e..d524f52e1 100644
--- a/apps/common/main/resources/less/colors-table-ie-fix.less
+++ b/apps/common/main/resources/less/colors-table-ie-fix.less
@@ -14,7 +14,8 @@
@background-loader-ie: fade(#000, 65%);
@background-alt-key-hint-ie: #FFD938;
@background-accent-button-ie: #446995;
-@background-contrast-popover-ie: #444444;
+@background-contrast-popover-ie: #fff;
+@shadow-contrast-popover-ie: rgba(0, 0, 0, 0.3);
@highlight-button-hover-ie: #d8dadc;
@highlight-button-pressed-ie: #7d858c;
@@ -36,7 +37,7 @@
@border-control-focus-ie: #848484;
@border-color-shading-ie: fade(#000, 20%);
@border-error-ie: #d9534f;
-@border-contrast-popover-ie: #444444;
+@border-contrast-popover-ie: #fff;
@text-normal-ie: #444;
@text-normal-pressed-ie: #fff;
diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less
index b11493858..d690cf62d 100644
--- a/apps/common/main/resources/less/colors-table.less
+++ b/apps/common/main/resources/less/colors-table.less
@@ -26,7 +26,8 @@
--background-scrim: fade(#000, 20%);
--background-loader: fade(#181818, 90%);
--background-alt-key-hint: #FFD938;
- --background-contrast-popover: #444444;
+ --background-contrast-popover: #fff;
+ --shadow-contrast-popover: rgba(0, 0, 0, 0.3);
--highlight-button-hover: #e0e0e0;
--highlight-button-pressed: #cbcbcb;
@@ -48,7 +49,7 @@
--border-control-focus: #848484;
--border-color-shading: fade(#000, 15%);
--border-error: #f62211;
- --border-contrast-popover: #444444;
+ --border-contrast-popover: #fff;
--text-normal: fade(#000, 80%);
--text-normal-pressed: fade(#000, 80%);
@@ -161,6 +162,7 @@
@background-alt-key-hint: var(--background-alt-key-hint);
@background-accent-button: var(--background-accent-button);
@background-contrast-popover: var(--background-contrast-popover);
+@shadow-contrast-popover: var(--shadow-contrast-popover);
// Highlight
// -------------------------
diff --git a/apps/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less
index c397cd8dd..1a3beb01d 100644
--- a/apps/common/main/resources/less/synchronize-tip.less
+++ b/apps/common/main/resources/less/synchronize-tip.less
@@ -93,16 +93,18 @@
.asc-synchronizetip {
background-color: @background-contrast-popover-ie;
background-color: @background-contrast-popover;
- color: @text-contrast-background-ie;
- color: @text-contrast-background;
+ color: @text-normal-ie;
+ color: @text-normal;
border-color: @border-contrast-popover-ie;
border-color: @border-contrast-popover;
.close {
&:before, &:after {
- background-color: @text-contrast-background-ie;
- background-color: @text-contrast-background;
+ background-color: @text-normal-ie;
+ background-color: @text-normal;
}
}
+ .box-shadow(0 0 40px 0 @shadow-contrast-popover-ie);
+ .box-shadow(0 0 40px 0 @shadow-contrast-popover);
}
.tip-arrow:before {
@@ -124,31 +126,33 @@
padding: 3px 12px;
margin-top: 10px;
&:hover {
- background-color: @highlight-header-button-hover-ie;
- background-color: @highlight-header-button-hover;
+ background-color: @highlight-button-hover-ie;
+ background-color: @highlight-button-hover;
}
&:active {
- background-color: @highlight-header-button-pressed-ie;
- background-color: @highlight-header-button-pressed;
+ background-color: @highlight-button-pressed-ie;
+ background-color: @highlight-button-pressed;
+ color: @text-normal-pressed-ie;
+ color: @text-normal-pressed;
}
}
.show-link label {
- border-bottom: @scaled-one-px-value-ie dotted @text-contrast-background-ie;
- border-bottom: @scaled-one-px-value dotted @text-contrast-background;
- color: @text-contrast-background-ie;
- color: @text-contrast-background;
+ border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie;
+ border-bottom: @scaled-one-px-value dotted @text-normal;
+ color: @text-normal-ie;
+ color: @text-normal;
cursor: pointer;
&:hover:not(:disabled) {
- color: @text-contrast-background;
- border-bottom-color: dotted @text-contrast-background;
+ color: @text-normal;
+ border-bottom-color: dotted @text-normal;
}
&:active {
- color: @text-contrast-background;
- border-bottom-color: dotted @text-contrast-background;
+ color: @text-normal;
+ border-bottom-color: dotted @text-normal;
}
}
}