From c63c4eb097025e136919764ff9f07ff8d44f2479 Mon Sep 17 00:00:00 2001
From: robertu7 <4065233+robertu7@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:14:31 +0800
Subject: [PATCH 1/5] fix(editor): remove unused spacing of editor title

---
 src/common/styles/utils/content.article.css | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/common/styles/utils/content.article.css b/src/common/styles/utils/content.article.css
index 1fed964b68..3850b136cc 100644
--- 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;
+    }
   }
 }
 

From f1bd26e6fbba94b3a00a641b5f40c95a54586d9b Mon Sep 17 00:00:00 2001
From: robertu7 <4065233+robertu7@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:39:10 +0800
Subject: [PATCH 2/5] feat(comment): extra spacing for last descendant comment

---
 .../ThreadComment/DescendantComments/index.tsx        | 11 +++++++++--
 .../DescendantComments/styles.module.css              |  4 ++++
 src/components/Comment/ThreadComment/index.tsx        | 10 ++++++++--
 .../Comment/ThreadComment/styles.module.css           |  4 ++++
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/components/Comment/ThreadComment/DescendantComments/index.tsx b/src/components/Comment/ThreadComment/DescendantComments/index.tsx
index 9ced369c2c..f909214a10 100644
--- 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
index ddd520429a..082d94e22d 100644
--- 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
index 5d22fc9a1b..20e7c00353 100644
--- 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
index a071b5ce17..149fd0c0b4 100644
--- 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);
+}

From dafccfe8aed0a8cee8a96b9920c3cc643d3e80e9 Mon Sep 17 00:00:00 2001
From: robertu7 <4065233+robertu7@users.noreply.github.com>
Date: Fri, 18 Oct 2024 17:27:09 +0800
Subject: [PATCH 3/5] fix(fonts): add sans serif as fallback for serif and mono
 fonts

---
 src/common/styles/variables/typography.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/styles/variables/typography.css b/src/common/styles/variables/typography.css
index 26a5b1072f..14865e2eb0 100644
--- 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 */

From c16b491cd5e690b93779d10bd43e1a68d4347266 Mon Sep 17 00:00:00 2001
From: devformatters2 <177856586+devformatters2@users.noreply.github.com>
Date: Mon, 21 Oct 2024 13:18:53 +0800
Subject: [PATCH 4/5] fix(campaign): hide featured feed of campaign detail

---
 src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx b/src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx
index ef3c0c68f4..84c304c9f6 100644
--- 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) ? (

From 0459a3910e9830f1e5aeb238adae212e4b0f6e4a Mon Sep 17 00:00:00 2001
From: Woz <177856586+gitwoz@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:44:02 +0800
Subject: [PATCH 5/5] chore(release): v5.6.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0e95cecfe4..c006a15a00 100644
--- 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 <hi@matters.town>",
   "engines": {