From 00dd93094b2c2c11a8d1312b8d994b30ec0ac820 Mon Sep 17 00:00:00 2001 From: mushka-n Date: Tue, 19 Sep 2023 12:43:41 +0300 Subject: [PATCH] styling updates --- .../CategoryFilter/DesktopView/index.styled.js | 1 + .../FormGallery/Filter/LanguageFilter/index.js | 18 ++++++++++++------ .../Filter/LanguageFilter/index.styled.js | 6 ++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/client/src/pages/FormGallery/Filter/CategoryFilter/DesktopView/index.styled.js b/packages/client/src/pages/FormGallery/Filter/CategoryFilter/DesktopView/index.styled.js index 42d638fc57..b4881a9767 100644 --- a/packages/client/src/pages/FormGallery/Filter/CategoryFilter/DesktopView/index.styled.js +++ b/packages/client/src/pages/FormGallery/Filter/CategoryFilter/DesktopView/index.styled.js @@ -50,6 +50,7 @@ export const CategoryFilterSubList = styled(DropDown)` top: 0; margin-top: ${({ marginTop }) => marginTop}; left: calc(100% + 4px); + padding: 4px 0; max-height: 296px; max-width: auto; diff --git a/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.js b/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.js index 6eca2f4228..66ba348305 100644 --- a/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.js +++ b/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.js @@ -1,18 +1,20 @@ import * as Styled from "./index.styled"; import DropDown from "@docspace/components/drop-down"; -import DropDownItem from "@docspace/components/drop-down-item"; import ExpanderDownReactSvgUrl from "PUBLIC_DIR/images/expander-down.react.svg?url"; import { ReactSVG } from "react-svg"; import { useRef, useState } from "react"; import { inject } from "mobx-react"; -import { withTranslation } from "react-i18next"; import { flagsIcons } from "@docspace/common/utils/image-helpers"; import { convertToCulture } from "@docspace/common/utils"; const avialableLocales = ["en", "zh", "it", "fr", "es", "de", "ja"]; -const LanguageFilter = ({ oformsFilter, filterOformsByLocale }) => { +const LanguageFilter = ({ + oformsFilter, + filterOformsByLocale, + currentColorScheme, +}) => { const dropdownRef = useRef(null); const [isOpen, setIsOpen] = useState(false); @@ -26,7 +28,10 @@ const LanguageFilter = ({ oformsFilter, filterOformsByLocale }) => { }; return ( - +
{ ); }; -export default inject(({ oformsStore }) => ({ +export default inject(({ auth, oformsStore }) => ({ oformsFilter: oformsStore.oformsFilter, filterOformsByLocale: oformsStore.filterOformsByLocale, -}))(withTranslation(["FormGallery", "Common"])(LanguageFilter)); + currentColorScheme: auth.settingsStore.currentColorScheme, +}))(LanguageFilter); diff --git a/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.styled.js b/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.styled.js index d4a0a59325..b74535948c 100644 --- a/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.styled.js +++ b/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.styled.js @@ -16,16 +16,14 @@ export const LanguageFilter = styled.div` justify-content: space-between; gap: 4px; padding: 8px; - background: ${(props) => - props.theme.createEditRoomDialog.thirdpartyStorage.combobox.background}; + background: transparent; border-radius: 3px; max-height: 32px; border: ${(props) => `1px solid ${ props.isOpen - ? props.theme.createEditRoomDialog.thirdpartyStorage.combobox - .isOpenDropdownBorderColor + ? props.currentColorScheme.main.accent : props.theme.createEditRoomDialog.thirdpartyStorage.combobox .dropdownBorderColor }`};