diff --git a/.eslintrc.js b/.eslintrc.js index c6cea664f8dd..90f7db3d0c00 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -91,7 +91,7 @@ module.exports = { 'no-constant-binary-expression': ERROR, 'no-continue': OFF, 'no-control-regex': WARNING, - 'no-else-return': [WARNING, {allowElseIf: true}], + 'no-else-return': OFF, 'no-empty': [WARNING, {allowEmptyCatch: true}], 'no-lonely-if': WARNING, 'no-nested-ternary': WARNING, diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostItem/Footer/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogPostItem/Footer/index.tsx index 8a5f418e5cd1..22020c37e380 100644 --- a/packages/docusaurus-theme-classic/src/theme/BlogPostItem/Footer/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/BlogPostItem/Footer/index.tsx @@ -13,8 +13,6 @@ import EditMetaRow from '@theme/EditMetaRow'; import TagsListInline from '@theme/TagsListInline'; import ReadMoreLink from '@theme/BlogPostItem/Footer/ReadMoreLink'; -import styles from './styles.module.css'; - export default function BlogPostItemFooter(): JSX.Element | null { const {metadata, isBlogPostPage} = useBlogPost(); const { @@ -37,41 +35,56 @@ export default function BlogPostItemFooter(): JSX.Element | null { return null; } - const canDisplayEditMetaRow = !!(editUrl || lastUpdatedAt || lastUpdatedBy); - - return ( - - ); + return ( + + ); + } + // BlogPost footer - list view + else { + return ( + + ); + } } diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostItem/Footer/styles.module.css b/packages/docusaurus-theme-classic/src/theme/BlogPostItem/Footer/styles.module.css deleted file mode 100644 index 458c10a61f60..000000000000 --- a/packages/docusaurus-theme-classic/src/theme/BlogPostItem/Footer/styles.module.css +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -.blogPostFooterDetailsFull { - flex-direction: column; -} - -.blogFooterPagePadding { - padding: 0; -} diff --git a/packages/docusaurus-theme-classic/src/theme/DocItem/Footer/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocItem/Footer/index.tsx index e4795432722a..3757d1cac2ed 100644 --- a/packages/docusaurus-theme-classic/src/theme/DocItem/Footer/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/DocItem/Footer/index.tsx @@ -9,26 +9,10 @@ import React from 'react'; import clsx from 'clsx'; import {ThemeClassNames} from '@docusaurus/theme-common'; import {useDoc} from '@docusaurus/theme-common/internal'; -import TagsListInline, { - type Props as TagsListInlineProps, -} from '@theme/TagsListInline'; +import TagsListInline from '@theme/TagsListInline'; import EditMetaRow from '@theme/EditMetaRow'; -function TagsRow(props: TagsListInlineProps) { - return ( -
-
- -
-
- ); -} - export default function DocItemFooter(): JSX.Element | null { const {metadata} = useDoc(); const {editUrl, lastUpdatedAt, lastUpdatedBy, tags} = metadata; @@ -45,10 +29,23 @@ export default function DocItemFooter(): JSX.Element | null { return (