Merge branch 'main' into glitch-soc/merge-upstream

2023-04-04 12:45:12 +02:00
parent af01ab7efe 0e919397db
commit d13ef49b15
7 changed files with 92 additions and 75 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2963,6 +2963,8 @@ $ui-header-height: 55px;
  margin-bottom: 10px;
  display: flex;
  flex-direction: row;
+  border-radius: 4px;
+  overflow: hidden;

  a {
    transition: background 100ms ease-in;
@ -7046,6 +7048,7 @@ noscript {

  .drawer__pager {
    height: 50vh;
+    border-radius: 4px;
  }

  .drawer__inner {