Merge commit '98f98249ffc3de0d020fa2ed9068b1cb82168984' into glitch-soc/merge-upstream

app/javascript/styles/mastodon-light/diff.scss

@@ -96,18 +96,6 @@
   color: $white;
 }
 
-.search__input {
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-top: 0;
-    border-bottom: 0;
-  }
-}
-
-.list-editor .search .search__input {
-  border-top: 0;
-  border-bottom: 0;
-}
-
 .upload-progress__backdrop {
   background: $ui-base-color;
 }

app/javascript/styles/mastodon/admin.scss

@@ -9,8 +9,11 @@ $content-width: 840px;
 .admin-wrapper {
   display: flex;
   justify-content: center;
+  box-sizing: border-box;
   width: 100%;
   min-height: 100vh;
+  padding: env(safe-area-inset-top) env(safe-area-inset-right)
+    env(safe-area-inset-bottom) env(safe-area-inset-left);
 
   .icon {
     width: 16px;

app/javascript/styles/mastodon/basics.scss

@@ -50,6 +50,7 @@ body {
     padding: 0;
     padding-left: env(safe-area-inset-left);
     padding-right: env(safe-area-inset-right);
+    box-sizing: border-box;
 
     &.layout-single-column {
       height: auto;
@@ -61,6 +62,7 @@ body {
       position: absolute;
       width: 100%;
       height: 100%;
+      padding-bottom: env(safe-area-inset-bottom);
     }
 
     &.with-modals--active {

app/javascript/styles/mastodon/components.scss

@@ -2817,12 +2817,14 @@ a.account__display-name {
   }
 
   &__panels {
+    box-sizing: border-box;
     display: flex;
     justify-content: center;
     gap: 16px;
     width: 100%;
     height: 100%;
     min-height: 100vh;
+    padding-bottom: env(safe-area-inset-bottom);
 
     &__pane {
       height: 100%;