Merge pull request #4905 from thematters/develop

Release: v5.6.4
thematters · Oct 21, 2024 · ceaf97f · ceaf97f
2 parents 4344cad + d8a0c49
commit ceaf97f
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matters-web",
-  "version": "5.6.3",
+  "version": "5.6.4",
   "description": "codebase of Matters' website",
   "author": "Matters <[email protected]>",
   "engines": {

diff --git a/src/common/styles/utils/content.article.css b/src/common/styles/utils/content.article.css
@@ -422,11 +422,15 @@
   }
 }
 
-.editor-title textarea {
-  margin: 0 0 var(--sp16);
+.editor-title {
+  margin-top: 0 !important;
 
-  @media (--sm-up) {
-    margin: var(--sp16) 0;
+  & textarea {
+    margin: 0 0 var(--sp16);
+
+    @media (--sm-up) {
+      margin: var(--sp16) 0;
+    }
   }
 }
 

diff --git a/src/common/styles/variables/typography.css b/src/common/styles/variables/typography.css
@@ -9,11 +9,11 @@
     'Microsoft JhengHei', 'WenQuanYi Micro Hei', sans-serif, 'Apple Color Emoji',
     'Segoe UI Emoji';
   --font-serif-tc: 'Songti TC', 'Songti SC', 'NSimSun', 'SimSun', serif,
-    'Apple Color Emoji', 'Segoe UI Emoji';
+    var(--font-sans-sc), 'Apple Color Emoji', 'Segoe UI Emoji';
   --font-serif-sc: 'Songti SC', 'Songti TC', 'NSimSun', 'SimSun', serif,
-    'Apple Color Emoji', 'Segoe UI Emoji';
+    var(--font-sans-sc), 'Apple Color Emoji', 'Segoe UI Emoji';
   --font-mono: menlo, 'SFMono-Regular', consolas, monaco, monospace,
-    'Apple Color Emoji', 'Segoe UI Emoji';
+    var(--font-sans-sc), 'Apple Color Emoji', 'Segoe UI Emoji';
 
   /* Type Scale */
   --text12: 0.75rem; /* 12px */

diff --git a/src/components/Comment/ThreadComment/DescendantComments/index.tsx b/src/components/Comment/ThreadComment/DescendantComments/index.tsx
@@ -1,3 +1,4 @@
+import classNames from 'classnames'
 import _uniqBy from 'lodash/uniqBy'
 import { useContext, useEffect } from 'react'
 
@@ -20,6 +21,7 @@ import {
   DESCENDANT_COMMENTS_COMMENT_PRIVATE,
   DESCENDANT_COMMENTS_COMMENT_PUBLIC,
 } from '../gql'
+import styles from './styles.module.css'
 
 type DescendantCommentPublic = NonNullable<
   NonNullable<
@@ -152,8 +154,13 @@ export const DescendantComments = ({
 
   return (
     <>
-      {result.map((node) => (
-        <li key={node.id}>
+      {result.map((node, index) => (
+        <li
+          key={node.id}
+          className={classNames({
+            [styles.lastDescendant]: index === result.length - 1,
+          })}
+        >
           <CommentFeed
             comment={node}
             pinnedComment={pinnedComment}

diff --git a/src/components/Comment/ThreadComment/DescendantComments/styles.module.css b/src/components/Comment/ThreadComment/DescendantComments/styles.module.css
@@ -10,3 +10,7 @@
     margin-top: var(--sp8);
   }
 }
+
+.lastDescendant {
+  margin-bottom: var(--sp16);
+}
diff --git a/src/components/Comment/ThreadComment/index.tsx b/src/components/Comment/ThreadComment/index.tsx
@@ -1,3 +1,4 @@
+import classNames from 'classnames'
 import { useEffect, useState } from 'react'
 
 import { filterComments } from '~/common/utils'
@@ -69,8 +70,13 @@ export const CommentThreadComment = ({
 
         {descendants.length > 0 && (
           <ul className={styles.descendants}>
-            {descendants.map((descendantComment) => (
-              <li key={descendantComment.id}>
+            {descendants.map((descendantComment, index) => (
+              <li
+                key={descendantComment.id}
+                className={classNames({
+                  [styles.lastDescendant]: index === descendants.length - 1,
+                })}
+              >
                 <CommentFeed
                   comment={descendantComment}
                   pinnedComment={pinnedComment}

diff --git a/src/components/Comment/ThreadComment/styles.module.css b/src/components/Comment/ThreadComment/styles.module.css
@@ -15,3 +15,7 @@
     transition-property: background-color;
   }
 }
+
+.lastDescendant {
+  margin-bottom: var(--sp16);
+}
diff --git a/src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx b/src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx
@@ -60,7 +60,7 @@ const ArticleFeedsTabs = ({
           })}
         />
 
-        <SquareTabs.Tab
+        {/* <SquareTabs.Tab
           selected={feedType === FEED_TYPE_FEATURED}
           onClick={() => {
             setFeedType(FEED_TYPE_FEATURED)
@@ -74,7 +74,7 @@ const ArticleFeedsTabs = ({
             defaultMessage: 'Featured',
             id: 'CnPG8j',
           })}
-        />
+        /> */}
 
         {[...stages].reverse().map((stage) =>
           shouldShowTab(stage.period?.start) ? (