diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-23 08:52:41 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-23 08:52:41 +0100 |
commit | 276b26b6141e7eb9f319a0719e472d582c014099 (patch) | |
tree | 334e6100b9c8aa1d07d11a4ad34a8befb954124a /app | |
parent | 33e7ef4d3d163125d73826143edcc0a0f7470781 (diff) | |
parent | 749fe73ec4500d78b3deb8cdd260ff6eb6c66e7c (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/features/explore/results.js | 6 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/components.scss | 37 | ||||
-rw-r--r-- | app/views/admin/instances/_instance.html.haml | 2 |
3 files changed, 41 insertions, 4 deletions
diff --git a/app/javascript/mastodon/features/explore/results.js b/app/javascript/mastodon/features/explore/results.js index ff900de08..339f883c5 100644 --- a/app/javascript/mastodon/features/explore/results.js +++ b/app/javascript/mastodon/features/explore/results.js @@ -24,15 +24,15 @@ const appendLoadMore = (id, list, onLoadMore) => { } }; -const renderAccounts = (results, onLoadMore) => appendLoadMore('accounts', results.get('accounts').map(item => ( +const renderAccounts = (results, onLoadMore) => appendLoadMore('accounts', results.get('accounts', ImmutableList()).map(item => ( <Account key={`account-${item}`} id={item} /> )), onLoadMore); -const renderHashtags = (results, onLoadMore) => appendLoadMore('hashtags', results.get('hashtags').map(item => ( +const renderHashtags = (results, onLoadMore) => appendLoadMore('hashtags', results.get('hashtags', ImmutableList()).map(item => ( <Hashtag key={`tag-${item.get('name')}`} hashtag={item} /> )), onLoadMore); -const renderStatuses = (results, onLoadMore) => appendLoadMore('statuses', results.get('statuses').map(item => ( +const renderStatuses = (results, onLoadMore) => appendLoadMore('statuses', results.get('statuses', ImmutableList()).map(item => ( <Status key={`status-${item}`} id={item} /> )), onLoadMore); diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 57b265f95..713d24c0f 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1154,6 +1154,43 @@ .audio-player { margin-top: 8px; } + + &.light { + .status__relative-time, + .status__visibility-icon { + color: $light-text-color; + } + + .status__display-name { + color: $inverted-text-color; + } + + .display-name { + color: $light-text-color; + + strong { + color: $inverted-text-color; + } + } + + .status__content { + color: $inverted-text-color; + + a { + color: $highlight-text-color; + } + + a.status__content__spoiler-link { + color: $primary-text-color; + background: $ui-primary-color; + + &:hover, + &:focus { + background: lighten($ui-primary-color, 8%); + } + } + } + } } .detailed-status__meta { diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml index 8a4396002..93f9bd418 100644 --- a/app/views/admin/instances/_instance.html.haml +++ b/app/views/admin/instances/_instance.html.haml @@ -1,7 +1,7 @@ .directory__tag = link_to admin_instance_path(instance) do %h4 - = fa_icon 'warning fw' if instance.failing? + = fa_icon 'warning fw', title: t('admin.instances.availability.warning') if instance.failing? = instance.domain %small |