From 38212e81bc941dc819092680c8fbddaf20f39540 Mon Sep 17 00:00:00 2001 From: TimofeyBoyko Date: Fri, 10 Dec 2021 19:12:02 +0800 Subject: [PATCH] Web:Components:MainButton: add dark theme support --- .../main-button/styled-main-button.js | 2 +- packages/asc-web-components/themes/base.js | 1 + packages/asc-web-components/themes/dark.js | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/asc-web-components/main-button/styled-main-button.js b/packages/asc-web-components/main-button/styled-main-button.js index c46f0a3bf3..b0b076bc54 100644 --- a/packages/asc-web-components/main-button/styled-main-button.js +++ b/packages/asc-web-components/main-button/styled-main-button.js @@ -128,7 +128,7 @@ const StyledSecondaryButton = styled(StyledMainButton)` height: 16px; min-height: 16px; path { - fill: #fff; + fill: ${(props) => props.theme.mainButton.svg.fill}; } } `; diff --git a/packages/asc-web-components/themes/base.js b/packages/asc-web-components/themes/base.js index 4895e1e03e..26771e9b1f 100644 --- a/packages/asc-web-components/themes/base.js +++ b/packages/asc-web-components/themes/base.js @@ -186,6 +186,7 @@ const Base = { svg: { margin: "auto", height: "100%", + fill: "#ffffff", }, secondaryButton: { diff --git a/packages/asc-web-components/themes/dark.js b/packages/asc-web-components/themes/dark.js index ae733a4c12..91db3ecf25 100644 --- a/packages/asc-web-components/themes/dark.js +++ b/packages/asc-web-components/themes/dark.js @@ -168,17 +168,17 @@ const Dark = { }, mainButton: { - backgroundColor: orangeMain, - disableBackgroundColor: orangeDisabled, - hoverBackgroundColor: orangeHover, - clickBackgroundColor: orangePressed, + backgroundColor: "#F59931", + disableBackgroundColor: "#4C3B2D", + hoverBackgroundColor: "#FFAD3D", + clickBackgroundColor: "#E6842E", padding: "5px 10px", borderRadius: "3px", lineHeight: "22px", fontSize: "15px", fontWeight: 700, - textColor: "#FFF", + textColor: "#333333", cornerRoundsTopRight: "0", cornerRoundsBottomRight: "0", @@ -186,6 +186,7 @@ const Dark = { svg: { margin: "auto", height: "100%", + fill: "#333333", }, secondaryButton: {