Revert "fix: fix defects"

This reverts commit c38e4e0.
twreporter · Jan 4, 2023 · 9b5f28c · 9b5f28c
1 parent bdca1f4
commit 9b5f28c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/packages/react-components/src/listing-page/components/list-item.js b/packages/react-components/src/listing-page/components/list-item.js
@@ -29,7 +29,7 @@ const Container = styled.div`
     width: ${mockup.tablet.cardWidth}px;
   `}
   ${mq.mobileOnly`
-    width: ${mockup.mobile.cardWidth}px;
+    width: ${(mockup.mobile.cardWidth / mockup.mobile.maxWidth) * 100}%;
   `}
 
   a {

diff --git a/packages/react-components/src/listing-page/components/list.js b/packages/react-components/src/listing-page/components/list.js
@@ -106,7 +106,7 @@ class List extends PureComponent {
         />
       )
     })
-    const headerTitle = catName || (tagName ? `#${tagName}` : '')
+    const headerTitle = catName || tagName
     const headerJSX = headerTitle ? (
       <TitleBar title={headerTitle ?? ''} />
     ) : null

diff --git a/packages/react-components/src/listing-page/components/topics/index.js b/packages/react-components/src/listing-page/components/topics/index.js
@@ -31,6 +31,8 @@ const NoData = styled.div`
   text-align: center;
 `
 
+const topicTitleText = '深度專題'
+
 class Topics extends Component {
   _buildRelatedPosts(posts) {
     const _buildPostJSX = post => {
@@ -100,7 +102,7 @@ class Topics extends Component {
       topSectionJSX = [
         <TitleBar
           key="top-title"
-          title={'深度專題'}
+          title={topicTitleText}
           subtitle={TEXT.SECTION_TITLE_FEATURED}
         />,
         <TopSectionContent
@@ -126,7 +128,10 @@ class Topics extends Component {
       <PageContent>
         {topSectionJSX}
         {isFetching && isFirstPage ? null : (
-          <TitleBar subtitle={TEXT.SECTION_TITLE_OTHERS} />
+          <TitleBar
+            title={topicTitleText}
+            subtitle={TEXT.SECTION_TITLE_OTHERS}
+          />
         )}
         <WrappedListSectionContent
           isFetching={isFetching}

diff --git a/packages/react-components/src/listing-page/constants/mockup-spec.js b/packages/react-components/src/listing-page/constants/mockup-spec.js
@@ -4,7 +4,7 @@ const marginBetweenItems = 20
 export default {
   marginBetweenItems,
   mobile: {
-    maxWidth: 325 * 2 + marginBetweenItems,
+    maxWidth: 375,
     cardWidth: 325,
     tagsWidth: 240,
     imgHeight: 205,

diff --git a/packages/react-components/src/title-bar/components/bar.js b/packages/react-components/src/title-bar/components/bar.js
@@ -23,8 +23,8 @@ const BarContainer = styled.div`
 
 const TitleBar = ({ title = '', subtitle = '' }) => (
   <BarContainer>
-    {title ? <H1 text={title} /> : null}
-    {subtitle ? <P1 text={subtitle} weight="bold" /> : null}
+    <H1 text={title} />
+    <P1 text={subtitle} weight="bold" />
     <Divider direction="horizontal" />
   </BarContainer>
 )