diff --git a/public/assets/images/floppy-disk.svg b/public/assets/images/floppy-disk.svg index 35104ff896..e763eb4915 100644 --- a/public/assets/images/floppy-disk.svg +++ b/public/assets/images/floppy-disk.svg @@ -1,10 +1,17 @@ - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/pages/MyAccount/components/Billing/MobileBilling/index.scss b/src/pages/MyAccount/components/Billing/MobileBilling/index.scss index 39f43b8bb8..b4d8ee1b5e 100644 --- a/src/pages/MyAccount/components/Billing/MobileBilling/index.scss +++ b/src/pages/MyAccount/components/Billing/MobileBilling/index.scss @@ -20,7 +20,7 @@ .my-account-mobile-billing__tabs-wrapper { padding: 0 var(--content-ph); white-space: nowrap; - border-bottom: 1px solid $light-gray-1; + border-bottom: 1px solid var(--gentle-stroke); } .my-account-mobile-billing__tab-panels { diff --git a/src/pages/OldCommon/components/CommonDetailContainer/MembersComponent/index.scss b/src/pages/OldCommon/components/CommonDetailContainer/MembersComponent/index.scss index e5bbf6a424..ffb837617b 100644 --- a/src/pages/OldCommon/components/CommonDetailContainer/MembersComponent/index.scss +++ b/src/pages/OldCommon/components/CommonDetailContainer/MembersComponent/index.scss @@ -145,7 +145,7 @@ font-style: normal; font-weight: 400; font-size: $xxsmall; - color: var(--secondary-fill); + color: var(--secondary-text); margin-top: 0.1rem; } diff --git a/src/pages/common/components/ChatComponent/components/MessageReply/MessageReply.module.scss b/src/pages/common/components/ChatComponent/components/MessageReply/MessageReply.module.scss index 5a2a74f296..a73cb951fe 100644 --- a/src/pages/common/components/ChatComponent/components/MessageReply/MessageReply.module.scss +++ b/src/pages/common/components/ChatComponent/components/MessageReply/MessageReply.module.scss @@ -18,7 +18,8 @@ flex-direction: row; align-items: flex-start; width: 100%; - background-color: $c-pink-light; + background-color: var(--secondary-fill); + color: var(--primary-text); border-radius: 0.875rem; padding: 0.5rem 0.75rem; } diff --git a/src/pages/common/components/CommonTabPanels/components/AboutTab/AboutTab.module.scss b/src/pages/common/components/CommonTabPanels/components/AboutTab/AboutTab.module.scss index 5d4eae9b9a..a2e7864d7c 100644 --- a/src/pages/common/components/CommonTabPanels/components/AboutTab/AboutTab.module.scss +++ b/src/pages/common/components/CommonTabPanels/components/AboutTab/AboutTab.module.scss @@ -68,13 +68,6 @@ } } -.separator { - width: 100%; - height: 0.0625rem; - margin: 0.875rem 0 1.75rem; - background-color: $c-neutrals-200; -} - .commonProjectsWrapper { @include tablet { padding-left: 2.5rem; diff --git a/src/pages/common/components/CommonTabPanels/components/AboutTab/AboutTab.tsx b/src/pages/common/components/CommonTabPanels/components/AboutTab/AboutTab.tsx index 434b6d0bca..b501a27e19 100644 --- a/src/pages/common/components/CommonTabPanels/components/AboutTab/AboutTab.tsx +++ b/src/pages/common/components/CommonTabPanels/components/AboutTab/AboutTab.tsx @@ -79,7 +79,6 @@ const AboutTab: FC = (props) => { const renderMobileColumn = () => (
-
{subCommons.length > 0 && ( <> = (props) => { circles={governance.circles} styles={{ projectsWrapper: styles.commonProjectsWrapper }} /> -
)} -
{rules.length > 0 && } -
= (props) => { )} {hasUnseenMention &&
@
} {isFollowing && ( - + )} {isNewTagVisible && (
= (props) => { const [isOpen, setIsOpen] = useState(false); const wrapperRef = useRef(null); const { isOutside, setOutsideValue } = useOutsideClick(wrapperRef); + const theme = useSelector(selectTheme); useEffect(() => { if (isOutside) { @@ -67,7 +71,11 @@ const EmojiPicker: FC = (props) => { }, )} > - +
)}
diff --git a/src/shared/ui-kit/TextEditor/components/MentionDropdown/MentionDropdown.module.scss b/src/shared/ui-kit/TextEditor/components/MentionDropdown/MentionDropdown.module.scss index a0437499b6..7c910722aa 100644 --- a/src/shared/ui-kit/TextEditor/components/MentionDropdown/MentionDropdown.module.scss +++ b/src/shared/ui-kit/TextEditor/components/MentionDropdown/MentionDropdown.module.scss @@ -6,9 +6,10 @@ left: 2.875rem; width: 20.125rem; max-height: 22.75rem; - background: $white; + background: var(--primary-background); + color: var(--primary-text); border-radius: 0.25rem; - box-shadow: 0 0.0625rem 0.3125rem rgba(0, 0, 0, 0.2); + box-shadow: 0 0.0625rem 0.3125rem var(--drop-shadow); padding: 0; margin: 0; overflow-y: auto; @@ -21,15 +22,15 @@ align-items: center; width: 100%; box-sizing: border-box; - border-bottom: 0.0625rem solid $c-neutrals-200; + border-bottom: 0.0625rem solid var(--gentle-stroke); &:hover { cursor: pointer; - background-color: $c-pink-hover-feed-cards; + background-color: var(--hover-fill); } &:focus { - background-color: $c-pink-hover-feed-cards; + background-color: var(--hover-fill); outline: none; } } diff --git a/src/styles/theme.scss b/src/styles/theme.scss index c233d102af..d9d4de8558 100644 --- a/src/styles/theme.scss +++ b/src/styles/theme.scss @@ -3,10 +3,11 @@ --secondary-background: #f8f8f5; --hover-fill: #fff9fd; --primary-text: #001a36; + --secondary-text: #a75a93; --gentle-stroke: #f4f5f5; --warning: #ff603e; --primary-fill: #c32ea3; - --secondary-fill: #a75a93; + --secondary-fill: #f3d4eb; --drop-shadow: rgba(0, 0, 0, 0.15259); } @@ -15,9 +16,10 @@ --secondary-background: #2e3452; --hover-fill: #131b23; --primary-text: #ffffff; + --secondary-text: #a75a93; --gentle-stroke: #2e3452; --warning: #ff603e; --primary-fill: #c32ea3; - --secondary-fill: #a75a93; + --secondary-fill: #743b65; --drop-shadow: rgba(0, 0, 0, 0.15259); }