diff --git a/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js b/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js index 7116d272a2..184d200499 100644 --- a/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js +++ b/packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js @@ -121,7 +121,6 @@ const StyledComboBox = styled(ComboBox)` .combo-button { border-radius: 3px; - height: auto; } `; diff --git a/packages/common/components/Article/sub-components/article-hide-menu-button.js b/packages/common/components/Article/sub-components/article-hide-menu-button.js index ea52c847dc..c0e239f54d 100644 --- a/packages/common/components/Article/sub-components/article-hide-menu-button.js +++ b/packages/common/components/Article/sub-components/article-hide-menu-button.js @@ -5,6 +5,7 @@ import { ReactSVG } from "react-svg"; import { desktop, mobile, tablet } from "@docspace/components/utils/device"; import { isTablet, isMobileOnly } from "react-device-detect"; import { useTranslation } from "react-i18next"; +import Base from "@docspace/components/themes/base"; const StyledHideArticleMenuButton = styled.div` display: flex; @@ -72,15 +73,27 @@ const StyledHideArticleMenuButton = styled.div` .article-hide-menu-icon_svg, .article-show-menu-icon_svg { height: 28px; + } + .article-hide-menu-icon_svg { svg { path { fill: ${({ currentColorScheme }) => currentColorScheme.main.accent}; } } } + + .article-show-menu-icon_svg { + svg { + path { + fill: ${(props) => props.theme.article.catalogShowText}; + } + } + } `; +StyledHideArticleMenuButton.defaultProps = { theme: Base }; + const HideArticleMenuButton = ({ showText, toggleShowText, diff --git a/packages/components/selector/sub-components/Footer/index.js b/packages/components/selector/sub-components/Footer/index.js index 0a1876cf7b..44c3b3e950 100644 --- a/packages/components/selector/sub-components/Footer/index.js +++ b/packages/components/selector/sub-components/Footer/index.js @@ -15,10 +15,6 @@ const StyledComboBox = styled(Combobox)` min-height: 40px; } - .combo-buttons_arrow-icon { - margin-top: 16px; - } - .combo-button-label, .combo-button-label:hover { font-size: 14px; diff --git a/packages/components/themes/base.js b/packages/components/themes/base.js index 66fbc3b5fb..3ab108ed08 100644 --- a/packages/components/themes/base.js +++ b/packages/components/themes/base.js @@ -2010,6 +2010,7 @@ const Base = { catalogItemHeader: "#A3A9AE", catalogItemText: "#555F65", catalogItemActiveBackground: "#DFE2E3", + catalogShowText: "#657077", }, section: { diff --git a/packages/components/themes/dark.js b/packages/components/themes/dark.js index a840a9afbe..53794df5f6 100644 --- a/packages/components/themes/dark.js +++ b/packages/components/themes/dark.js @@ -2002,6 +2002,7 @@ const Dark = { catalogItemHeader: "#858585", catalogItemText: "rgba(255, 255, 255, 0.6)", catalogItemActiveBackground: "#333333", + catalogShowText: "#adadad", }, section: {