Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream

app/javascript/styles/mastodon/basics.scss

@@ -48,6 +48,8 @@ body {
 
   &.app-body {
     padding: 0;
+    padding-left: env(safe-area-inset-left);
+    padding-right: env(safe-area-inset-right);
 
     &.layout-single-column {
       height: auto;

app/javascript/styles/mastodon/components.scss

@@ -1980,6 +1980,13 @@ body > [data-popper-placement] {
     }
   }
 
+  &__avatar-wrapper .account__avatar {
+    @container (width < 360px) {
+      width: 35px !important;
+      height: 35px !important;
+    }
+  }
+
   &__domain-pill {
     display: inline-flex;
     background: rgba($highlight-text-color, 0.2);
@@ -2151,11 +2158,6 @@ body > [data-popper-placement] {
   border-radius: var(--avatar-border-radius);
   background: var(--surface-background-color);
 
-  @container (width < 360px) {
-    width: 35px !important;
-    height: 35px !important;
-  }
-
   img {
     width: 100%;
     height: 100%;