From 648d6d72471f6dbf42af78c0da2bb36b55010847 Mon Sep 17 00:00:00 2001 From: Drew Schuster Date: Tue, 28 Aug 2018 16:10:04 -0700 Subject: Delete .gitkeep file since the app/javascript/mastodon directory is no longer empty (#8510) --- app/javascript/mastodon/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/javascript/mastodon/.gitkeep (limited to 'app/javascript') diff --git a/app/javascript/mastodon/.gitkeep b/app/javascript/mastodon/.gitkeep deleted file mode 100644 index e69de29bb..000000000 -- cgit From ceed1ebe5b308a95f9c167c93d3bc0976937fb58 Mon Sep 17 00:00:00 2001 From: Jakub Mendyk Date: Wed, 29 Aug 2018 01:19:58 +0200 Subject: Fix followers/follows layout issues from #8418 (#8505) * Add alwaysShowScrollbar prop to ScrollableList * Fix followers/follows layout issues from #8418 --- app/javascript/mastodon/components/scrollable_list.js | 9 ++++++--- app/javascript/mastodon/features/followers/index.js | 5 +++-- app/javascript/mastodon/features/following/index.js | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'app/javascript') diff --git a/app/javascript/mastodon/components/scrollable_list.js b/app/javascript/mastodon/components/scrollable_list.js index 4b433f32c..5c888650c 100644 --- a/app/javascript/mastodon/components/scrollable_list.js +++ b/app/javascript/mastodon/components/scrollable_list.js @@ -26,6 +26,7 @@ export default class ScrollableList extends PureComponent { hasMore: PropTypes.bool, prepend: PropTypes.node, alwaysPrepend: PropTypes.bool, + alwaysShowScrollbar: PropTypes.bool, emptyMessage: PropTypes.node, children: PropTypes.node, }; @@ -141,7 +142,7 @@ export default class ScrollableList extends PureComponent { } render () { - const { children, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, alwaysPrepend, emptyMessage, onLoadMore } = this.props; + const { children, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, alwaysPrepend, alwaysShowScrollbar, emptyMessage, onLoadMore } = this.props; const { fullscreen } = this.state; const childrenCount = React.Children.count(children); @@ -172,11 +173,13 @@ export default class ScrollableList extends PureComponent { ); } else { + const scrollable = alwaysShowScrollbar; + scrollableArea = ( -
+
{alwaysPrepend && prepend} -
+
{emptyMessage}
diff --git a/app/javascript/mastodon/features/followers/index.js b/app/javascript/mastodon/features/followers/index.js index 5eb05367e..97d59cc4a 100644 --- a/app/javascript/mastodon/features/followers/index.js +++ b/app/javascript/mastodon/features/followers/index.js @@ -66,13 +66,14 @@ export default class Followers extends ImmutablePureComponent { - - } + alwaysPrepend + alwaysShowScrollbar emptyMessage={emptyMessage} > {accountIds.map(id => diff --git a/app/javascript/mastodon/features/following/index.js b/app/javascript/mastodon/features/following/index.js index 95e786882..17bc7ec6e 100644 --- a/app/javascript/mastodon/features/following/index.js +++ b/app/javascript/mastodon/features/following/index.js @@ -66,13 +66,14 @@ export default class Following extends ImmutablePureComponent { - - } + alwaysPrepend + alwaysShowScrollbar emptyMessage={emptyMessage} > {accountIds.map(id => -- cgit From 9463bba5fb6873fa70e05f239079ee1a0072b70c Mon Sep 17 00:00:00 2001 From: "Mélanie Chauvel (ariasuni)" Date: Wed, 29 Aug 2018 01:20:11 +0200 Subject: Reduce padding of profile metadata boxes to allow more text (#8491) --- app/javascript/styles/mastodon/components.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript') diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index b25a9df31..db9c166a2 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -5367,7 +5367,7 @@ noscript { dt, dd { box-sizing: border-box; - padding: 14px 20px; + padding: 14px 5px; text-align: center; max-height: 48px; overflow: hidden; -- cgit From 702a92629968db91e88b785a7cfdf78998719a20 Mon Sep 17 00:00:00 2001 From: caasi Huang Date: Wed, 29 Aug 2018 17:05:22 +0800 Subject: Replace '貼' with '嘟' for 'toot' (#8421) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace '貼' with '嘟' so the web front-end looks more consistent. --- app/javascript/mastodon/locales/zh-TW.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'app/javascript') diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 5b32a15bb..09e9150d0 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -1,7 +1,7 @@ { "account.badges.bot": "機器人", "account.block": "封鎖 @{name}", - "account.block_domain": "隱藏來自 {domain} 的一切貼文", + "account.block_domain": "隱藏來自 {domain} 的一切嘟文", "account.blocked": "已被封鎖的", "account.direct": "發送私訊給 @{name}", "account.disclaimer_full": "下列資料不一定完整。", @@ -67,10 +67,10 @@ "compose_form.direct_message_warning": "這條嘟文僅對有被提及的使用者才能看到。", "compose_form.direct_message_warning_learn_more": "了解更多", "compose_form.hashtag_warning": "此則推文將不會在任何主題標籤中看見，只有公開的推文可以用主題標籤來搜尋。", - "compose_form.lock_disclaimer": "你的帳號沒有{locked}。任何人都可以關注你，看到發給關注者的貼文。", + "compose_form.lock_disclaimer": "你的帳號沒有{locked}。任何人都可以關注你，看到發給關注者的嘟文。", "compose_form.lock_disclaimer.lock": "上鎖", "compose_form.placeholder": "在想些什麼？", - "compose_form.publish": "貼掉", + "compose_form.publish": "嘟掉", "compose_form.publish_loud": "{publish}！", "compose_form.sensitive.marked": "此媒體已被標註為敏感的", "compose_form.sensitive.unmarked": "此媒體未被標註為敏感的", @@ -92,7 +92,7 @@ "confirmations.redraft.message": "你確定要刪除這條嘟文並重新編輯它嗎? 所有相關的回覆、轉嘟與最愛都會被刪除。", "confirmations.unfollow.confirm": "取消關注", "confirmations.unfollow.message": "真的不要繼續關注 {name} 了嗎？", - "embed.instructions": "要內嵌此貼文，請將以下代碼貼進你的網站。", + "embed.instructions": "要內嵌此嘟文，請將以下代碼貼進你的網站。", "embed.preview": "看上去會變成這樣：", "emoji_button.activity": "活動", "emoji_button.custom": "自訂", @@ -118,7 +118,7 @@ "empty_column.hashtag": "這個主題標籤下什麼都沒有。", "empty_column.home": "你還沒關注任何人。造訪{public}或利用搜尋功能找到其他用者。", "empty_column.home.public_timeline": "公開時間軸", - "empty_column.list": "此份清單尚未有東西。當此清單的成員貼出了新的狀態時，它們就會出現在這裡。", + "empty_column.list": "此份清單尚未有東西。當此清單的成員嘟出了新的狀態時，它們就會出現在這裡。", "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.", "empty_column.mutes": "You haven't muted any users yet.", "empty_column.notifications": "還沒有任何通知。和別的使用者互動來開始對話。", @@ -246,7 +246,7 @@ "privacy.direct.short": "私訊", "privacy.private.long": "只有關注你的使用者能看到", "privacy.private.short": "僅關注者", - "privacy.public.long": "貼到公開時間軸", + "privacy.public.long": "嘟到公開時間軸", "privacy.public.short": "公開", "privacy.unlisted.long": "公開，但不會顯示在公開時間軸", "privacy.unlisted.short": "不公開", -- cgit