diff --git a/public/assets/logo/seedit.png b/public/assets/logo/seedit.png index 0042a226..30613201 100644 Binary files a/public/assets/logo/seedit.png and b/public/assets/logo/seedit.png differ diff --git a/public/translations/en/default.json b/public/translations/en/default.json index fb520dd4..8d5d1839 100644 --- a/public/translations/en/default.json +++ b/public/translations/en/default.json @@ -1,7 +1,7 @@ { "header_hot": "hot", "header_new": "new", - "header_rising": "rising", + "header_active": "active", "header_controversial": "controversial", "header_top": "top", "account_bar_preferences": "preferences", diff --git a/public/translations/it/default.json b/public/translations/it/default.json index 53cd63e7..f42465e9 100644 --- a/public/translations/it/default.json +++ b/public/translations/it/default.json @@ -1,7 +1,7 @@ { "header_hot": "popolari", "header_new": "nuovi", - "header_rising": "in crescita", + "header_active": "attivi", "header_controversial": "discussi", "header_top": "più votati", "account_bar_preferences": "preferenze", diff --git a/src/components/expando/expando.module.css b/src/components/expando/expando.module.css index d7598428..4d6ab354 100644 --- a/src/components/expando/expando.module.css +++ b/src/components/expando/expando.module.css @@ -4,7 +4,7 @@ .expando { display: block; - padding: 5px 0 5px 0; + padding: 5px; clear: left; position: relative; } diff --git a/src/components/feed-post/feed-post.module.css b/src/components/feed-post/feed-post.module.css index 2414e209..cfc84a48 100644 --- a/src/components/feed-post/feed-post.module.css +++ b/src/components/feed-post/feed-post.module.css @@ -1,8 +1,12 @@ .container { - clear: both; + display: flex; + flex-direction: column; + padding-bottom: 8px; +} + +.row { display: flex; align-items: flex-start; - padding-bottom: 8px; } .leftcol { diff --git a/src/components/feed-post/feed-post.tsx b/src/components/feed-post/feed-post.tsx index 6cca7ac8..24f689d1 100644 --- a/src/components/feed-post/feed-post.tsx +++ b/src/components/feed-post/feed-post.tsx @@ -30,56 +30,58 @@ const FeedPost: FC = ({ post, index }) => { return (
-
-
-
-
+
+
+
+
+
+
+
{upvoteCount === 0 && downvoteCount === 0 ? '•' : upvoteCount - downvoteCount}
+
+
+
-
{upvoteCount === 0 && downvoteCount === 0 ? '•' : upvoteCount - downvoteCount}
-
-
+ {hasThumbnail && } +
+
+
+

+ e.preventDefault()}> + {postTitleOrContent} + + {flair && ( + <> +   + + + )} +   + {linkUrl && ( + + ( + + {linkUrl} + + ) + + )} +

+ +

+ {t('feed_post_submitted')} {utils.getFormattedTime(timestamp)} {t('feed_post_by')}  + e.preventDefault()}> + u/{author.shortAddress} + +  {t('feed_post_to')} + e.preventDefault()}> +  p/{subplebbit.shortAddress} + +

+
- {hasThumbnail && } -
-
-
-

- e.preventDefault()}> - {postTitleOrContent} - - {flair && ( - <> -   - - - )} -   - {linkUrl && ( - - ( - - {linkUrl} - - ) - - )} -

- -

- {t('feed_post_submitted')} {utils.getFormattedTime(timestamp)} {t('feed_post_by')}  - e.preventDefault()}> - u/{author.shortAddress} - -  {t('feed_post_to')} - e.preventDefault()}> -  p/{subplebbit.shortAddress} - -

- -
-
+
); }; diff --git a/src/components/header/header.tsx b/src/components/header/header.tsx index 00cbbb0a..5563831b 100644 --- a/src/components/header/header.tsx +++ b/src/components/header/header.tsx @@ -14,7 +14,7 @@ const Header: FC = () => { const [theme] = useTheme(); const [selected, setSelected] = useState(sortType || '/topMonth'); - const labels = [t('header_hot'), t('header_new'), t('header_rising'), t('header_controversial'), t('header_top')]; + const labels = [t('header_hot'), t('header_new'), t('header_active'), t('header_controversial'), t('header_top')]; useEffect(() => { if (sortType) {