From 2373a6101c6860a511d0bc23da6f96290238134d Mon Sep 17 00:00:00 2001
From: Tarrien <drew@gyro-tech.net>
Date: Wed, 28 Feb 2024 09:39:01 -0500
Subject: [PATCH] Security updates and theme updates

---
 .../flavours/glitch/styles/modern/diff.css    |  39 +-
 .../flavours/glitch/styles/modern/modern.css  | 412 +++++++++++-------
 2 files changed, 271 insertions(+), 180 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/modern/diff.css b/app/javascript/flavours/glitch/styles/modern/diff.css
index c95d24bd75..e8d4687eae 100644
--- a/app/javascript/flavours/glitch/styles/modern/diff.css
+++ b/app/javascript/flavours/glitch/styles/modern/diff.css
@@ -22,6 +22,18 @@ body.app-body.flavour-modern-glitch > #mastodon .character-counter__wrapper span
   font-size: 0.9em;
   font-weight: 500;
 }
+body.app-body.flavour-modern-glitch > #mastodon .compose-form__highlightable {
+  margin-bottom: 50px !important;
+}
+body.app-body.flavour-modern-glitch > #mastodon .compose-form__submit {
+  position: absolute;
+  right: -12px;
+  top: 100%;
+  margin-top: 24px;
+}
+body.app-body.flavour-modern-glitch > #mastodon .compose-form__submit button {
+  padding: 10px 20px;
+}
 body.app-body.flavour-modern-glitch > #mastodon .collapsed .status__content {
   height: auto !important;
   overflow: visible;
@@ -104,8 +116,8 @@ body.app-body.flavour-modern-glitch > #mastodon .reactions-bar button:not(.activ
 body.app-body.flavour-modern-glitch > #mastodon .reactions-bar:empty {
   display: none;
 }
-body.app-body.flavour-modern-glitch > #mastodon .collapsed > .status__info .notification__message {
-  padding-bottom: 0 !important;
+body.app-body.flavour-modern-glitch > #mastodon .notification__message + .status {
+  padding-top: 0 !important;
 }
 body.app-body.flavour-modern-glitch > #mastodon .notification > .notification__message {
   padding-inline: 15px !important;
@@ -119,22 +131,6 @@ body.app-body.flavour-modern-glitch > #mastodon .notification__favourite-icon-wr
   width: 1.28571429em !important;
   text-align: center;
 }
-body.app-body.flavour-modern-glitch > #mastodon .status__prepend,
-body.app-body.flavour-modern-glitch > #mastodon .status__info .notification__message {
-  padding-bottom: 15px !important;
-  padding-top: 0 !important;
-  margin-top: -5px !important;
-}
-body.app-body.flavour-modern-glitch > #mastodon .status__prepend .status__prepend-icon-wrapper,
-body.app-body.flavour-modern-glitch > #mastodon .status__info .notification__message .status__prepend-icon-wrapper {
-  all: unset;
-  margin-inline-end: 10px;
-  display: flex;
-}
-body.app-body.flavour-modern-glitch > #mastodon .status__prepend .status__prepend-icon-wrapper i,
-body.app-body.flavour-modern-glitch > #mastodon .status__info .notification__message .status__prepend-icon-wrapper i {
-  margin: auto;
-}
 body.app-body.flavour-modern-glitch > #mastodon .detailed-status__wrapper .focusable:not(.status)::before {
   content: unset !important;
 }
@@ -150,9 +146,6 @@ body.app-body.flavour-modern-glitch > #mastodon .pillbar-button {
   border-radius: 0 !important;
   padding: 6px;
 }
-body.app-body.flavour-modern-glitch > #mastodon .account__header__account-note {
-  margin-block: 10px 0;
-}
 body.app-body.flavour-modern-glitch > #mastodon .account__header__account-note:focus-within {
   border-radius: var(--radius) !important;
 }
@@ -185,5 +178,7 @@ body.app-body.flavour-modern-glitch > #mastodon .account-card .media-modal__clos
   flex-grow: 0.2;
 }
 .layout-multiple-columns.flavour-modern-glitch .drawer__inner {
-  margin-top: -10px;
+  margin-top: -20px;
+  max-height: unset !important;
+  min-height: calc(100% + 40px);
 }
diff --git a/app/javascript/flavours/glitch/styles/modern/modern.css b/app/javascript/flavours/glitch/styles/modern/modern.css
index 637be6ffbf..d2a5f4ab5d 100644
--- a/app/javascript/flavours/glitch/styles/modern/modern.css
+++ b/app/javascript/flavours/glitch/styles/modern/modern.css
@@ -406,6 +406,8 @@ a:focus-visible,
 }
 .scrollable,
 .detailed-status__action-bar,
+.column-back-button,
+.column-header__collapsible.collapsed,
 .column-header__collapsible-inner,
 .audio-player,
 .search__input {
@@ -507,6 +509,7 @@ a:focus-visible,
 }
 .emoji-mart-category-list button {
   position: relative;
+  padding: 0 !important;
   padding-top: 100% !important;
 }
 .emoji-mart-category-list button img,
@@ -540,18 +543,22 @@ a:focus-visible,
 #mastodon .compose-panel > * {
   padding-inline: 0;
 }
+#mastodon .compose-panel > .navigation-bar {
+  padding-top: 0 !important;
+}
+#mastodon .compose-panel .search,
+.drawer .search {
+  margin-bottom: 25px;
+}
 #mastodon .search {
   border-radius: var(--radius);
   margin-inline: -5px;
-  margin-bottom: 15px !important;
 }
 #mastodon .search label {
   box-sizing: border-box;
 }
 #mastodon .search input {
   border-radius: var(--radius-round) !important;
-  padding-inline-start: 20px !important;
-  padding-inline-end: 40px !important;
 }
 #mastodon .search .search__icon > i {
   margin-inline: 5px;
@@ -572,6 +579,13 @@ a:focus-visible,
 #mastodon .compose-form {
   min-height: unset;
   overflow: unset;
+  gap: 15px;
+}
+#mastodon .compose-form > * {
+  margin: 0 !important;
+}
+#mastodon .compose-form > [aria-hidden="true"] {
+  display: none;
 }
 #mastodon .compose-form > .navigation-bar {
   margin-top: 10px;
@@ -583,22 +597,6 @@ a:focus-visible,
 #mastodon .compose-form .reply-indicator__display-name {
   padding: 0;
 }
-#mastodon .compose-form .compose-form__highlightable {
-  border-radius: var(--radius);
-  overflow: visible !important;
-}
-#mastodon .compose-form .compose-form__highlightable > .compose-form__footer {
-  gap: 8px;
-}
-#mastodon .compose-form .compose-form__highlightable > .compose-form__footer .compose-form__buttons {
-  gap: 2px;
-}
-#mastodon .compose-form .compose-form__highlightable > .compose-form__footer .compose-form__buttons button {
-  padding: 6px;
-}
-#mastodon .compose-form .compose-form__highlightable .compose-form__submit button {
-  padding: 6px;
-}
 #mastodon .compose-form .compose-form__autosuggest-wrapper,
 #mastodon .compose-form .autosuggest-textarea__textarea {
   border-radius: var(--radius) var(--radius) 0 0 !important;
@@ -610,33 +608,87 @@ a:focus-visible,
 #mastodon .compose-form .compose-form__publish-button-wrapper {
   overflow: visible !important;
   max-width: 100%;
+  padding: 0;
 }
 #mastodon .compose-form .compose-form__upload__actions {
   z-index: 5;
   position: relative;
 }
-#mastodon .compose-form .compose-form__upload-thumbnail {
+#mastodon .compose-form .compose-form__upload__actions button {
+  background: none;
+}
+#mastodon .compose-form .compose-form__upload__thumbnail {
   display: flex;
   flex-direction: column;
 }
 #mastodon .compose-form .compose-form__upload__warning {
   position: relative;
-  display: flex;
-  justify-content: center;
-  background: rgba(0,0,0,0.7);
   flex-grow: 1;
-  box-shadow: 0 -50px rgba(0,0,0,0.7);
+  display: flex;
 }
-#mastodon .compose-form .compose-form__upload__warning > button {
+#mastodon .compose-form .compose-form__upload__warning button {
+  margin-top: auto;
+}
+#mastodon .compose-form .compose-form__upload__warning button.active {
+  box-shadow: 0 0 0 100px rgba(0,0,0,0.75);
   width: 100%;
   height: 100%;
-  font-weight: 700;
-  padding-inline: 1em;
-  color: #fff;
+  font-weight: bold;
+  font-size: 1.1em;
+  color: inherit;
+  transition: background 0.2s, transform 0.2s cubic-bezier(0, 0, 0, 1) !important;
 }
-#mastodon .compose-form .compose-form__upload__warning > button i {
-  margin-inline-end: 0.2em;
-  transform: scale(1.2);
+#mastodon .compose-form .compose-form__upload__warning button.active svg {
+  height: 1.2em;
+  width: 1.2em;
+}
+#mastodon .compose-form .compose-form__upload__warning button.active:hover,
+#mastodon .compose-form .compose-form__upload__warning button.active:focus {
+  background: rgba(20,20,20,0.75);
+}
+#mastodon .compose-form__highlightable {
+  border-radius: var(--radius);
+  overflow: visible !important;
+}
+#mastodon .compose-form__highlightable #cw-spoiler-input {
+  border-radius: 0 !important;
+}
+#mastodon .compose-form__highlightable textarea {
+  background: none !important;
+}
+#mastodon .compose-form__highlightable > .compose-form__footer {
+  gap: 12px;
+}
+#mastodon .compose-form__highlightable > .compose-form__footer .compose-form__dropdowns {
+  max-width: calc(100% - 7ch);
+}
+#mastodon .compose-form__highlightable > .compose-form__footer .compose-form__actions {
+  position: relative;
+}
+#mastodon .compose-form__highlightable > .compose-form__footer .compose-form__buttons {
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+  gap: 0;
+  flex-grow: 9999;
+}
+#mastodon .compose-form__highlightable > .compose-form__footer .compose-form__buttons > * {
+  flex-grow: 1;
+  box-sizing: border-box;
+}
+#mastodon .compose-form__highlightable > .compose-form__footer .compose-form__buttons button {
+  flex-grow: 1;
+  padding: 5px;
+}
+#mastodon .compose-form__highlightable > .compose-form__footer .compose-form__submit button {
+  padding: 8px 16px;
+}
+#mastodon .compose-form__highlightable > .compose-form__footer .character-counter {
+  position: absolute;
+  inset-inline-end: 0;
+  bottom: calc(100% + 12px);
+  padding: 4px;
+  font-size: 13px;
 }
 .server-banner {
   padding: 10px;
@@ -938,7 +990,7 @@ a:focus-visible,
   margin-bottom: 10px;
   background-color: inherit;
   border-radius: var(--radius) !important;
-  animation: slideUp backwards 0.4s cubic-bezier(0, 1, 1, 1);
+  animation: fade backwards 0.4s cubic-bezier(0, 1, 1, 1);
 }
 #mastodon .account-timeline__header .account__moved-note {
   box-sizing: border-box;
@@ -978,43 +1030,51 @@ a:focus-visible,
   top: var(--radius);
 }
 #mastodon .account-timeline__header .account__header__bar {
+  position: relative;
+  z-index: 2;
   border: 0;
-  padding: 0 20px;
+  padding-inline: 20px;
   border-radius: var(--radius) var(--radius) 0 0;
   margin-top: calc(0px - var(--radius)) !important;
   display: flex;
   flex-direction: column;
   background: inherit;
+  isolation: isolate;
 }
 @media (max-width: 890px) {
   #mastodon .account-timeline__header .account__header__bar {
     padding-inline: 15px;
   }
 }
+#mastodon .account-timeline__header .account__header__bar::before {
+  content: "";
+  position: absolute;
+  inset-inline: 0;
+  height: 95px;
+  background: inherit;
+  z-index: -1;
+  border-radius: var(--radius);
+  mask: linear-gradient(to bottom, transparent, #000);
+}
 #mastodon .account-timeline__header .account__header__bar .account__header__tabs {
   overflow: visible !important;
-  position: relative;
   align-items: flex-end;
   padding: 0;
   height: unset !important;
   margin-top: -55px !important;
-  isolation: isolate;
 }
 #mastodon .account-timeline__header .account__header__bar .account__header__tabs::before {
   content: "";
   position: absolute;
-  top: 0;
-  left: -20px;
-  right: -20px;
-  bottom: -100px;
+  top: -55px;
+  inset-inline: 0;
+  height: 150px;
   backdrop-filter: blur(40px);
   filter: brightness(1.1);
   pointer-events: none;
   opacity: 0.7;
-  z-index: -1;
+  z-index: -2;
   clip-path: inset(55px 0 0 0 round var(--radius));
-  mask: linear-gradient(transparent 55px, #000 50px, transparent);
-  -webkit-mask: linear-gradient(transparent 55px, #000 50px, transparent);
 }
 #mastodon .account-timeline__header .account__header__bar .account__header__tabs ~ div {
   z-index: 2;
@@ -1049,31 +1109,29 @@ a:focus-visible,
   gap: 0 0.4em;
   font-weight: 600;
 }
+#mastodon .account-timeline__header .account__header__extra {
+  margin-top: 5px;
+}
+#mastodon .account-timeline__header .account__header__bio {
+  margin: 0;
+}
+#mastodon .account-timeline__header .account__header__bio > * {
+  padding-inline: 0;
+}
+#mastodon .account-timeline__header .account__header__bio .account__header__content {
+  padding: 0px;
+}
 #mastodon .account-timeline__header .account__header__badges {
   margin-top: 10px;
 }
 #mastodon .account-timeline__header .account__header__badges span {
   font-weight: 600;
 }
-#mastodon .account-timeline__header .account__header__bio {
-  padding: 0;
-  margin: 0;
-}
-#mastodon .account-timeline__header .account__header__bio > * {
-  padding-inline: 0;
-}
-#mastodon .account-timeline__header .account__header__content {
-  padding-top: 0;
-}
-#mastodon .account-timeline__header .account__header__extra {
-  margin-top: 1em;
-}
-#mastodon :not(.admin-account-bio) > div > .account__header__fields,
+#mastodon .account__header__fields,
 #mastodon .account__header__account-note {
   display: flex;
   flex-wrap: wrap;
   gap: 2px;
-  margin-bottom: 20px;
   background: none;
   border-radius: var(--radius);
   overflow: hidden;
@@ -1081,19 +1139,12 @@ a:focus-visible,
   max-width: 100%;
   border: 0;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__fields:not(:first-child),
-#mastodon .account__header__account-note.account__header__fields:not(:first-child) {
-  margin-top: 10px;
-  margin-bottom: -10px;
+#mastodon .account__header__fields:first-child,
+#mastodon .account__header__account-note:first-child {
+  margin-block: 5px 15px;
 }
-.public-account-bio .account__header__fields {
-  padding: 20px !important;
-  padding-bottom: 0 !important;
-}
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl,
-#mastodon .account__header__account-note dl,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note {
+#mastodon .account__header__fields dl,
+#mastodon .account__header__account-note dl {
   display: inline;
   border-radius: 0;
   overflow: hidden;
@@ -1103,37 +1154,27 @@ a:focus-visible,
   overflow: hidden;
   flex-grow: 1;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl:not(.verified),
-#mastodon .account__header__account-note dl:not(.verified),
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note:not(.verified),
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note:not(.verified) {
+#mastodon .account__header__fields dl:not(.verified),
+#mastodon .account__header__account-note dl:not(.verified) {
   background-color: var(--elevated-color);
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dt,
-#mastodon .account__header__account-note dl dt,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dt,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dt {
+#mastodon .account__header__fields dl dt,
+#mastodon .account__header__account-note dl dt {
   all: unset;
   color: unset;
   opacity: 0.9;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dd,
-#mastodon .account__header__account-note dl dd,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dd,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dd {
+#mastodon .account__header__fields dl dd,
+#mastodon .account__header__account-note dl dd {
   padding: 0;
   white-space: unset;
   max-height: unset;
   text-align: unset;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dd > span > a:first-child:last-child::after,
+#mastodon .account__header__fields dl dd > span > a:first-child:last-child::after,
 #mastodon .account__header__account-note dl dd > span > a:first-child:last-child::after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dd > span > a:first-child:last-child::after,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dd > span > a:first-child:last-child::after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dd .h-card:first-child:last-child a::after,
-#mastodon .account__header__account-note dl dd .h-card:first-child:last-child a::after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dd .h-card:first-child:last-child a::after,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dd .h-card:first-child:last-child a::after {
+#mastodon .account__header__fields dl dd .h-card:first-child:last-child a::after,
+#mastodon .account__header__account-note dl dd .h-card:first-child:last-child a::after {
   content: "";
   position: absolute;
   inset: 0;
@@ -1141,58 +1182,42 @@ a:focus-visible,
   opacity: 0;
   transition: opacity 0.2s;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dd > span > a:first-child:last-child:hover:after,
+#mastodon .account__header__fields dl dd > span > a:first-child:last-child:hover:after,
 #mastodon .account__header__account-note dl dd > span > a:first-child:last-child:hover:after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dd > span > a:first-child:last-child:hover:after,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dd > span > a:first-child:last-child:hover:after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dd .h-card:first-child:last-child a:hover:after,
+#mastodon .account__header__fields dl dd .h-card:first-child:last-child a:hover:after,
 #mastodon .account__header__account-note dl dd .h-card:first-child:last-child a:hover:after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dd .h-card:first-child:last-child a:hover:after,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dd .h-card:first-child:last-child a:hover:after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dd > span > a:first-child:last-child:focus:after,
+#mastodon .account__header__fields dl dd > span > a:first-child:last-child:focus:after,
 #mastodon .account__header__account-note dl dd > span > a:first-child:last-child:focus:after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dd > span > a:first-child:last-child:focus:after,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dd > span > a:first-child:last-child:focus:after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dd .h-card:first-child:last-child a:focus:after,
-#mastodon .account__header__account-note dl dd .h-card:first-child:last-child a:focus:after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dd .h-card:first-child:last-child a:focus:after,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dd .h-card:first-child:last-child a:focus:after {
+#mastodon .account__header__fields dl dd .h-card:first-child:last-child a:focus:after,
+#mastodon .account__header__account-note dl dd .h-card:first-child:last-child a:focus:after {
   opacity: 1;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dd.verified,
-#mastodon .account__header__account-note dl dd.verified,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dd.verified,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dd.verified {
+#mastodon .account__header__fields dl dd.verified,
+#mastodon .account__header__account-note dl dd.verified {
   overflow: visible !important;
   border: 0;
   background: none;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dd.verified a::before,
+#mastodon .account__header__fields dl dd.verified a::before,
 #mastodon .account__header__account-note dl dd.verified a::before,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dd.verified a::before,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dd.verified a::before,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dd.verified a::after,
-#mastodon .account__header__account-note dl dd.verified a::after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dd.verified a::after,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dd.verified a::after {
+#mastodon .account__header__fields dl dd.verified a::after,
+#mastodon .account__header__account-note dl dd.verified a::after {
   content: "";
   position: absolute;
   inset: 0;
   background: currentcolor;
   opacity: 0.2;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields dl dd.verified a::after,
-#mastodon .account__header__account-note dl dd.verified a::after,
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note dd.verified a::after,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note dd.verified a::after {
+#mastodon .account__header__fields dl dd.verified a::after,
+#mastodon .account__header__account-note dl dd.verified a::after {
   background: linear-gradient(20deg, currentcolor, transparent) !important;
   opacity: 0.2 !important;
   z-index: -2;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note {
+#mastodon .account__header__fields.account__header__account-note,
+#mastodon .account__header__account-note.account__header__account-note {
   display: flex;
-  margin-bottom: 10px;
+  margin-bottom: 10px !important;
   gap: 0;
   border: 0;
   padding: 0 !important;
@@ -1202,8 +1227,8 @@ a:focus-visible,
   font-size: 12px;
   width: unset;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note label,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note label {
+#mastodon .account__header__fields.account__header__account-note label,
+#mastodon .account__header__account-note.account__header__account-note label {
   z-index: 2;
   padding: 0 !important;
   padding-inline-end: 0.7em !important;
@@ -1213,20 +1238,20 @@ a:focus-visible,
   font-weight: inherit;
   vertical-align: unset;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note:focus-within,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note:focus-within {
+#mastodon .account__header__fields.account__header__account-note:focus-within,
+#mastodon .account__header__account-note.account__header__account-note:focus-within {
   padding: 0.5em 0.7em !important;
   margin-inline: -5px !important;
   border: 1px solid;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note:not(:focus-within),
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note:not(:focus-within) {
+#mastodon .account__header__fields.account__header__account-note:not(:focus-within),
+#mastodon .account__header__account-note.account__header__account-note:not(:focus-within) {
   border-radius: 0;
   border-bottom: 1px solid;
   padding-bottom: 0.4em !important;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note textarea,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note textarea {
+#mastodon .account__header__fields.account__header__account-note textarea,
+#mastodon .account__header__account-note.account__header__account-note textarea {
   width: 0;
   flex-grow: 1;
   margin: 0 !important;
@@ -1242,12 +1267,12 @@ a:focus-visible,
   vertical-align: unset;
   background: none;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note textarea::placeholder,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note textarea::placeholder {
+#mastodon .account__header__fields.account__header__account-note textarea::placeholder,
+#mastodon .account__header__account-note.account__header__account-note textarea::placeholder {
   font-weight: 600;
 }
-#mastodon :not(.admin-account-bio) > div > .account__header__fields.account__header__account-note.account__header__account-note label,
-#mastodon .account__header__account-note.account__header__account-note.account__header__account-note label {
+#mastodon .account__header__fields.account__header__account-note label,
+#mastodon .account__header__account-note.account__header__account-note label {
   margin: 0;
   font-weight: 600;
   padding-inline: 14px;
@@ -1286,6 +1311,9 @@ a:focus-visible,
 #mastodon :not(.explore__search-header) + .account__section-headline:not(:first-child) button::before {
   border-color: transparent transparent var(--border-color);
 }
+#mastodon .account__disclaimer {
+  border-top: 1px solid;
+}
 #mastodon .account-gallery__container {
   border-radius: var(--radius);
   overflow: clip;
@@ -1528,6 +1556,58 @@ a:focus-visible,
 #mastodon .account-card::after {
   content: unset !important;
 }
+#mastodon .account__wrapper {
+  gap: 15px;
+  flex-wrap: wrap;
+}
+#mastodon .account__wrapper .account__display-name {
+  flex-grow: 100;
+}
+#mastodon .account__wrapper .account__contents {
+  line-height: 1.4;
+  flex-basis: 70%;
+  width: 100px;
+  flex-grow: 100;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 0 20px;
+  flex-wrap: wrap;
+}
+#mastodon .account__wrapper .account__contents * {
+  line-height: unset !important;
+}
+#mastodon .account__wrapper .account__contents .display-name {
+  height: unset;
+  margin: 0;
+  width: 27ch !important;
+  flex-grow: 1;
+}
+#mastodon .account__wrapper .account__contents .display-name span {
+  display: block;
+}
+#mastodon .account__wrapper .account__contents .account__details {
+  flex-direction: column;
+  width: 25ch;
+}
+#mastodon .account__wrapper .account__contents .account__details span {
+  white-space: break-spaces !important;
+}
+#mastodon .account__wrapper .account__contents .account__details:has(.verified-badge) > span:first-child {
+  display: none;
+}
+#mastodon .account__wrapper .account__relationship {
+  display: flex !important;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+  min-width: 10ch;
+  gap: 10px;
+  flex-grow: 1;
+}
+#mastodon .account__wrapper .account__relationship button {
+  background: var(--elevated-color);
+  color: inherit;
+}
 #mastodon .scrollable > div:first-child > [tabindex="-1"]:last-child .status__wrapper::after {
   content: unset;
 }
@@ -1540,8 +1620,8 @@ a:focus-visible,
 .scrollable :not(.focusable) > .account,
 .timeline-hint {
   overflow: hidden;
-  transition: background 0.2s, box-shadow 0.4s, margin 0.2s, border 0.2s;
-  animation: slideUp backwards 0.4s cubic-bezier(0, 1, 1, 1);
+  transition: background 0.2s, box-shadow 0.4s, border 0.2s;
+  animation: fade 0.4s backwards cubic-bezier(0, 1, 1, 1);
   position: relative;
   border-radius: var(--radius);
 }
@@ -1569,8 +1649,7 @@ a:focus-visible,
 .account-card.account-card,
 .scrollable :not(.focusable) > .account.account-card,
 .timeline-hint.account-card {
-  animation-name: slideUpFade;
-  animation-delay: 0.44s;
+  animation: slideUpFade backwards 0.44s cubic-bezier(0, 1, 1, 1);
 }
 .focusable.trends__item:nth-child(1),
 .entry.trends__item:nth-child(1),
@@ -2126,6 +2205,8 @@ a:focus-visible,
   width: 100px;
   margin: 0 !important;
   opacity: 0.5;
+  overflow: hidden;
+  border-radius: var(--radius);
 }
 #mastodon .notification .status .status__content ~ [style*="aspect-ratio:"] .video-player__controls {
   display: none;
@@ -2347,6 +2428,12 @@ a:focus-visible,
 #mastodon .status__content__spoiler-link:focus::after {
   opacity: 1;
 }
+#mastodon .detailed-status__wrapper-direct,
+#mastodon .status-direct,
+#mastodon .status__wrapper-direct,
+#mastodon .conversation {
+  background: none;
+}
 #mastodon .detailed-status__wrapper-direct .status__prepend,
 #mastodon .status-direct .status__prepend,
 #mastodon .status__wrapper-direct .status__prepend,
@@ -2775,10 +2862,6 @@ a:focus-visible,
     border-radius: var(--radius);
     overflow: hidden;
   }
-  .layout-single-column .tabs-bar__wrapper .column-back-button,
-  .layout-single-column .column-back-button--slim .column-back-button .column-back-button {
-    background: none;
-  }
   .layout-single-column .tabs-bar__wrapper .column-header,
   .layout-single-column .column-back-button--slim .column-back-button .column-header {
     background: none !important;
@@ -2788,6 +2871,11 @@ a:focus-visible,
   .layout-single-column .tabs-bar__wrapper .column-header > button,
   .layout-single-column .column-back-button--slim .column-back-button .column-header > button {
     z-index: 2;
+    display: inline;
+  }
+  .layout-single-column .tabs-bar__wrapper .column-header > button svg,
+  .layout-single-column .column-back-button--slim .column-back-button .column-header > button svg {
+    vertical-align: middle;
   }
   .layout-single-column .tabs-bar__wrapper .column-header__buttons button,
   .layout-single-column .column-back-button--slim .column-back-button .column-header__buttons button {
@@ -2798,7 +2886,7 @@ a:focus-visible,
     margin: 5px;
     margin-inline-start: 0;
     font-size: 0.9em;
-    padding-inline: 15px;
+    padding-inline: 10px;
   }
   .layout-single-column .tabs-bar__wrapper .column-header__buttons button .column-header__icon,
   .layout-single-column .column-back-button--slim .column-back-button .column-header__buttons button .column-header__icon {
@@ -2808,6 +2896,14 @@ a:focus-visible,
   .layout-single-column .column-back-button--slim .column-back-button .column-header__buttons button:not(.active) {
     background: var(--elevated-color) !important;
   }
+  .layout-single-column .tabs-bar__wrapper .column-header__buttons button svg,
+  .layout-single-column .column-back-button--slim .column-back-button .column-header__buttons button svg {
+    margin: 0;
+  }
+  .layout-single-column .tabs-bar__wrapper .column-header__buttons button span,
+  .layout-single-column .column-back-button--slim .column-back-button .column-header__buttons button span {
+    display: none;
+  }
   .layout-single-column .tabs-bar__wrapper .column-header__buttons button::before,
   .layout-single-column .column-back-button--slim .column-back-button .column-header__buttons button::before {
     content: "";
@@ -3047,28 +3143,28 @@ a:focus-visible,
   transform: scaleX(-1);
 }
 .getting-started,
-#mastodon .column.column[data-column="getting-started"] > .optionally-scrollable.optionally-scrollable {
+#mastodon .column[aria-labelledby="Getting-started"] > .scrollable.scrollable.scrollable {
   position: relative;
   padding: 5px 10px !important;
 }
 .getting-started .getting-started__wrapper,
-#mastodon .column.column[data-column="getting-started"] > .optionally-scrollable.optionally-scrollable .getting-started__wrapper {
+#mastodon .column[aria-labelledby="Getting-started"] > .scrollable.scrollable.scrollable .getting-started__wrapper {
   background: none;
 }
 .getting-started .getting-started__wrapper a,
-#mastodon .column.column[data-column="getting-started"] > .optionally-scrollable.optionally-scrollable .getting-started__wrapper a,
+#mastodon .column[aria-labelledby="Getting-started"] > .scrollable.scrollable.scrollable .getting-started__wrapper a,
 .getting-started .getting-started__wrapper .column-subheading,
-#mastodon .column.column[data-column="getting-started"] > .optionally-scrollable.optionally-scrollable .getting-started__wrapper .column-subheading {
+#mastodon .column[aria-labelledby="Getting-started"] > .scrollable.scrollable.scrollable .getting-started__wrapper .column-subheading {
   border: 0 !important;
   padding: 20px;
   background: none;
 }
 .getting-started .getting-started__footer,
-#mastodon .column.column[data-column="getting-started"] > .optionally-scrollable.optionally-scrollable .getting-started__footer {
+#mastodon .column[aria-labelledby="Getting-started"] > .scrollable.scrollable.scrollable .getting-started__footer {
   padding-inline: 20px;
 }
 .getting-started .getting-started__footer a span,
-#mastodon .column.column[data-column="getting-started"] > .optionally-scrollable.optionally-scrollable .getting-started__footer a span {
+#mastodon .column[aria-labelledby="Getting-started"] > .scrollable.scrollable.scrollable .getting-started__footer a span {
   font-size: 1.1em !important;
   line-height: 2;
 }
@@ -3500,6 +3596,7 @@ a:focus-visible,
   }
   #mastodon:not(:has(.navigation-panel__sign-in-banner)) .ui__header::before,
   #mastodon:not(:has(.navigation-panel__sign-in-banner)) .ui__header::after {
+    all: unset;
     content: "";
     position: fixed;
     bottom: 0;
@@ -3543,7 +3640,7 @@ a:focus-visible,
     display: flex;
     flex-direction: column;
     bottom: 4px;
-    z-index: 200;
+    z-index: 201;
     font-size: 1.7em;
     margin: 0 !important;
     padding: 0 !important;
@@ -3575,7 +3672,7 @@ a:focus-visible,
     display: flex;
     flex-direction: column;
     bottom: 4px;
-    z-index: 200;
+    z-index: 201;
     font-size: 1.7em;
     margin: 0 !important;
     padding: 0 !important;
@@ -3607,7 +3704,7 @@ a:focus-visible,
     display: flex;
     flex-direction: column;
     bottom: 4px;
-    z-index: 200;
+    z-index: 201;
     font-size: 1.7em;
     margin: 0 !important;
     padding: 0 !important;
@@ -3639,7 +3736,7 @@ a:focus-visible,
     display: flex;
     flex-direction: column;
     bottom: 4px;
-    z-index: 200;
+    z-index: 201;
     font-size: 1.7em;
     margin: 0 !important;
     padding: 0 !important;
@@ -3671,7 +3768,7 @@ a:focus-visible,
     display: flex;
     flex-direction: column;
     bottom: 4px;
-    z-index: 200;
+    z-index: 201;
     font-size: 1.7em;
     margin: 0 !important;
     padding: 0 !important;
@@ -3741,10 +3838,6 @@ a:focus-visible,
   #mastodon:not(:has(.navigation-panel__sign-in-banner)):has(.column-link.active:not([href='/home']):not([href='/notifications']):not([href='/explore']):not([href='/public/local']):not([href='/lists']):not([href^="/lists"])) .tabs-bar__wrapper .column-header__collapsible {
     visibility: visible;
   }
-  #mastodon .explore__search-header,
-  #mastodon .search input {
-    background: var(--elevated-color);
-  }
   #mastodon .columns-area__panels {
     justify-content: flex-start;
     max-width: 100% !important;
@@ -3826,6 +3919,7 @@ a:focus-visible,
   }
   #mastodon .compose-form {
     padding: 10px;
+    margin-bottom: 100px;
   }
   #mastodon .compose-form::before {
     content: "";
@@ -4577,6 +4671,7 @@ a:focus-visible,
 .layout-multiple-columns #mastodon .columns-area .drawer {
   padding-inline: 6px !important;
   padding-top: 20px !important;
+  overflow: clip;
 }
 .layout-multiple-columns #mastodon .columns-area .drawer .drawer__header {
   border-radius: var(--radius-round);
@@ -4617,6 +4712,10 @@ a:focus-visible,
 .layout-multiple-columns #mastodon .columns-area .search {
   margin-inline: 10px;
 }
+.layout-multiple-columns #mastodon .columns-area .compose-form {
+  display: flex;
+  flex-direction: column;
+}
 .layout-multiple-columns #mastodon .columns-area .drawer__inner:not(.darker),
 .layout-multiple-columns #mastodon .columns-area .drawer__inner__mastodon {
   background-color: transparent;
@@ -4627,9 +4726,6 @@ a:focus-visible,
   padding: 0 !important;
   border-radius: var(--radius-round) var(--radius-round) 0 0;
 }
-.layout-multiple-columns #mastodon .columns-area .compose-form:first-child {
-  padding-top: 0;
-}
 .layout-multiple-columns #mastodon .columns-area .getting-started__trends {
   padding: 0px 20px;
 }