version 5

daostack · Nov 15, 2023 · 12c24b1 · 12c24b1
1 parent 41397c8
commit 12c24b1
Show file tree

Hide file tree

Showing 18 changed files with 66 additions and 46 deletions.
diff --git a/public/assets/images/floppy-disk.svg b/public/assets/images/floppy-disk.svg
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -79,7 +79,6 @@ const AboutTab: FC<AboutTabProps> = (props) => {
   const renderMobileColumn = () => (
     <div className={styles.mainColumnWrapper}>
       <CommonDescription common={common} />
-      <div className={styles.separator} />
       {subCommons.length > 0 && (
         <>
           <CommonProjects
@@ -88,12 +87,9 @@ const AboutTab: FC<AboutTabProps> = (props) => {
             circles={governance.circles}
             styles={{ projectsWrapper: styles.commonProjectsWrapper }}
           />
-          <div className={styles.separator} />
         </>
       )}
-      <div className={styles.separator} />
       {rules.length > 0 && <CommonRules rules={rules} />}
-      <div className={styles.separator} />
       <CommonEntranceInfo
         limitations={limitations}
         withJoinRequest={!commonMember}

diff --git a/...ommonTabPanels/components/MembersTab/components/MemberDropdown/MemberDropdown.module.scss b/...ommonTabPanels/components/MembersTab/components/MemberDropdown/MemberDropdown.module.scss
@@ -2,6 +2,6 @@
 
 .dropdownItem {
   &:hover {
-    background-color: $c-primary-200;
+    background-color: var(--hover-fill);
   }
 }
diff --git a/src/pages/common/components/FeedCard/components/FeedCardTags/FeedCardTags.module.scss b/src/pages/common/components/FeedCard/components/FeedCardTags/FeedCardTags.module.scss
@@ -38,6 +38,7 @@
 
 .pin {
   color: $c-pink-primary;
+  margin-left: 0.75rem;
 }
 
 .pinActive {
@@ -48,7 +49,11 @@
   width: 1.25rem;
   height: 1.25rem;
   margin-left: 0.75rem;
-  color: var(--primary-text);
+  color: var(--secondary-text);
+}
+
+.starActive {
+  color: $white;
 }
 
 .unseen {

diff --git a/src/pages/common/components/FeedCard/components/FeedCardTags/FeedCardTags.tsx b/src/pages/common/components/FeedCard/components/FeedCardTags/FeedCardTags.tsx
@@ -58,7 +58,12 @@ export const FeedCardTags: FC<FeedCardTagsProps> = (props) => {
       )}
       {hasUnseenMention && <div className={styles.hasUnseenMention}>@</div>}
       {isFollowing && (
-        <StarIcon className={styles.starIcon} stroke="currentColor" />
+        <StarIcon
+          className={classNames(styles.starIcon, {
+            [styles.starActive]: isActive,
+          })}
+          stroke="currentColor"
+        />
       )}
       {isNewTagVisible && (
         <div

diff --git a/...ed/components/FeedLayout/components/FollowFeedItemButton/FollowFeedItemButton.module.scss b/...ed/components/FeedLayout/components/FollowFeedItemButton/FollowFeedItemButton.module.scss
@@ -2,7 +2,8 @@
 
 .button {
   --btn-w: 3rem;
-  background-color: $c-pink-active-feed-cards-light;
+  background-color: transparent;
+  border: none;
 }
 
 .icon {

diff --git a/src/services/PayMeService.ts b/src/services/PayMeService.ts
@@ -10,7 +10,7 @@ const axiosClient = axios.create({
 });
 
 const endpoints = {
-  createBuyerTokenPage: `${config.cloudFunctionUrl}/payments/payme/payin/create-buyer-token-page`,
+  createBuyerTokenPage: `${config.cloudFunctionUrl}/api/payments/payme/payin/create-buyer-token-page`,
 };
 
 const createBuyerTokenPage = async (

diff --git a/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss b/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss
@@ -169,7 +169,7 @@
 }
 
 .replyMessageContainerCurrentUser {
-  background-color: $c-pink-light;
+  background-color: var(--secondary-fill);
 }
 
 .replyMessageImage {
@@ -185,14 +185,14 @@
 
 .replyMessageName {
   font-size: $xxsmall;
-  color: $c-neutrals-600;
+  color: $black;
   font-weight: 600;
   line-height: 1.25rem;
   margin-bottom: 0.125rem;
 }
 
 .replyMessageNameCurrentUser {
-  color: $black;
+  color: var(--primary-text);
 }
 
 .replyMessageNameWithImage {
@@ -205,15 +205,15 @@
   -webkit-box-orient: vertical;
   overflow: hidden;
   text-overflow: ellipsis;
-  color: $c-neutrals-600;
+  color: $black;
   font-size: $xxsmall;
   margin-bottom: 0.4rem;
   line-height: 0.8rem;
   max-height: 1.6rem;
 }
 
 .replyMessageContentCurrentUser {
-  color: $black;
+  color: var(--primary-text);
 }
 
 .replyMessageContentWithImage {

diff --git a/src/shared/components/SocialLinks/index.scss b/src/shared/components/SocialLinks/index.scss
@@ -51,7 +51,7 @@
     align-items: center;
     width: 3.5rem;
     height: 3.5rem;
-    background-color: $white;
+    background-color: var(--secondary-background);
     box-shadow: 0px 6.77778px 25.4167px rgba(0, 0, 0, 0.15259);
     border-radius: 50%;
     border: none;

diff --git a/src/shared/components/Tabs/Tab/index.scss b/src/shared/components/Tabs/Tab/index.scss
@@ -45,13 +45,13 @@
   }
 }
 .custom-tab--active {
-  --tab-bb-color: var(--tab-active-color);
-  --tab-color: var(--tab-active-color);
+  --tab-bb-color: var(--secondary-text);
+  --tab-color: var(--secondary-text);
 
   &:active,
   &:hover {
-    --tab-bb-color: var(--tab-active-color);
-    --tab-color: var(--tab-active-color);
+    --tab-bb-color: var(--secondary-text);
+    --tab-color: var(--secondary-text);
   }
 }
 .custom-tab--with-icon {

diff --git a/src/shared/ui-kit/TextEditor/components/Editor/Editor.module.scss b/src/shared/ui-kit/TextEditor/components/Editor/Editor.module.scss
@@ -37,6 +37,7 @@
   --text-editor-h: auto;
   max-height: 50vh;
   min-height: 4.5rem;
+  background-color: var(--secondary-background);
 }
 
 .editorReadOnly {