diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 064c8c5d..c6d80595 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -86,6 +86,7 @@ "Commenting": "Commenting", "Comments": "Comments", "CommentsWithCount": "{count, plural, =0 {{count} comments} one {{count} comment} few {{count} comments} other {{count} comments}}", + "Common feed": "All", "Communities": "Communities", "Community Discussion Rules": "Community Discussion Rules", "Community Principles": "Community Principles", diff --git a/public/locales/ru/translation.json b/public/locales/ru/translation.json index 09497c5a..ee135233 100644 --- a/public/locales/ru/translation.json +++ b/public/locales/ru/translation.json @@ -31,7 +31,7 @@ "All posts rating": "Рейтинг всех постов", "All posts": "Все публикации", "All topics": "Все темы", - "All": "Общая лента", + "All": "Все", "Almost done! Check your email.": "Почти готово! Осталось подтвердить вашу почту.", "Are you sure you want to delete this comment?": "Уверены, что хотите удалить этот комментарий?", "Are you sure you want to delete this draft?": "Уверены, что хотите удалить этот черновик?", @@ -90,6 +90,7 @@ "Commenting": "Комментирование", "Comments": "Комментарии", "CommentsWithCount": "{count, plural, =0 {{count} комментариев} one {{count} комментарий} few {{count} комментария} other {{count} комментариев}}", + "Common feed": "Общая лента", "Communities": "Сообщества", "Community Discussion Rules": "Правила дискуссий в сообществе", "Community Principles": "Принципы сообщества", diff --git a/src/components/Feed/ArticleCard/ArticleCard.module.scss b/src/components/Feed/ArticleCard/ArticleCard.module.scss index d19865b1..02ba61f0 100644 --- a/src/components/Feed/ArticleCard/ArticleCard.module.scss +++ b/src/components/Feed/ArticleCard/ArticleCard.module.scss @@ -13,7 +13,9 @@ &:hover { .shoutCardCover { - transform: scale(1.05); + img { + transform: scale(1.1); + } } } @@ -120,13 +122,10 @@ height: 100%; object-fit: cover; position: absolute; + transform: scale(1); + transition: transform 0.3s; width: 100%; } - - &:hover img { - /* TODO: small zoom on hover */ - transform: scaleZ(1.1); - } } .shoutAuthor { diff --git a/src/components/Feed/ArticleCard/ArticleCard.tsx b/src/components/Feed/ArticleCard/ArticleCard.tsx index 19529050..85f921a8 100644 --- a/src/components/Feed/ArticleCard/ArticleCard.tsx +++ b/src/components/Feed/ArticleCard/ArticleCard.tsx @@ -99,6 +99,7 @@ const getMainTopicTitle = (article: Shout, lng: string) => { const LAYOUT_ASPECT = { music: styles.aspectRatio1x1, + audio: styles.aspectRatio1x1, literature: styles.aspectRatio16x9, video: styles.aspectRatio16x9, image: styles.aspectRatio4x3, diff --git a/src/components/Feed/Sidebar/Sidebar.tsx b/src/components/Feed/Sidebar/Sidebar.tsx index a116bc4b..ab8aacca 100644 --- a/src/components/Feed/Sidebar/Sidebar.tsx +++ b/src/components/Feed/Sidebar/Sidebar.tsx @@ -40,7 +40,7 @@ export const Sidebar = () => { > - {t('All')} + {t('Common feed')} diff --git a/src/components/Views/Expo/Expo.tsx b/src/components/Views/Expo/Expo.tsx index cb9fa754..3040cb9b 100644 --- a/src/components/Views/Expo/Expo.tsx +++ b/src/components/Views/Expo/Expo.tsx @@ -126,58 +126,61 @@ export const Expo = (props: Props) => { return (
+
+ +
+ 0} fallback={}>
-
{(shout) => ( diff --git a/src/styles/app.scss b/src/styles/app.scss index 0bb124a4..df2eefc9 100644 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -678,7 +678,7 @@ figure { cursor: default; &:hover { - background: #fff; + background: transparent; } } }