Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream

2023-07-12 15:00:41 +02:00
parent 67055b0343 4534498a8e
commit 7e54a30f06
25 changed files with 236 additions and 318 deletions
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@@ -15,7 +15,8 @@
 .status__content a,
 .link-footer a,
 .reply-indicator__content a,
-.status__content__read-more-button {
+.status__content__read-more-button,
+.status__content__translate-button {
  text-decoration: underline;

  &:hover,
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -981,7 +981,8 @@ body > [data-popper-placement] {
  max-height: 22px * 15; // 15 lines is roughly above 500 characters
 }

-.status__content__read-more-button {
+.status__content__read-more-button,
+.status__content__translate-button {
  display: block;
  font-size: 15px;
  line-height: 22px;