fixup! nzws theme v4.3 port

# This is the 1st commit message:

fix seasonal themes

# The commit message #2 will be skipped:

# fix radtown themes

CHANGELOG.md

@@ -2,17 +2,6 @@
 
 All notable changes to this project will be documented in this file.
 
-## [4.3.6] - 2025-03-13
-
-### Security
-
-- Update dependency `omniauth-saml`
-- Update dependency `rack`
-
-### Fixed
-
-- Fix Stoplight errors when using `REDIS_NAMESPACE` (#34126 by @ClearlyClaire)
-
 ## [4.3.5] - 2025-03-10
 
 ### Changed

Gemfile.lock

@@ -464,7 +464,7 @@ GEM
     oj (3.16.6)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    omniauth (2.1.3)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -475,9 +475,9 @@ GEM
     omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    omniauth-saml (2.2.3)
+    omniauth-saml (2.2.1)
       omniauth (~> 2.1)
-      ruby-saml (~> 1.18)
+      ruby-saml (~> 1.17)
     omniauth_openid_connect (0.6.1)
       omniauth (>= 1.9, < 3)
       openid_connect (~> 1.1)
@@ -619,7 +619,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.13)
+    rack (2.2.11)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.2)
@@ -767,7 +767,7 @@ GEM
       rubocop-rspec (~> 3, >= 3.0.1)
     ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
-    ruby-saml (1.18.0)
+    ruby-saml (1.17.0)
       nokogiri (>= 1.13.10)
       rexml
     ruby-vips (2.2.3)

app/javascript/styles/mastodon-autumn.scss

@@ -1,3 +1,2 @@
 @import 'mastodon-autumn/variables';
 @import 'application';
-@import 'mastodon-autumn/diff';

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

@@ -1,75 +0,0 @@
-.column {
-  > .scrollable {
-    background: $ui-base-color;
-  }
-
-  .account__header {
-    background: lighten($ui-base-color, 4%);
-
-    &__fields {
-      background: darken($ui-base-color, 4%);
-    }
-  }
-
-  &-back-button,
-  &-header {
-    background: lighten($ui-base-color, 4%);
-
-    &__collapsible {
-      background: lighten($ui-base-color, 8%);
-    }
-  }
-}
-
-.drawer {
-  &__header {
-    background: lighten($ui-base-color, 8%);
-  }
-
-  &__inner {
-    background: lighten($ui-base-color, 13%);
-  }
-
-  &__inner__mastodon {
-    background: lighten($ui-base-color, 13%)
-      url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="%231A1E25"/></svg>')
-      no-repeat bottom/100% auto;
-  }
-}
-
-.notification__filter-bar,
-.account__section-headline,
-.content-wrapper,
-.sidebar-wrapper--empty {
-  background: $ui-base-color;
-}
-
-.about {
-  &__section__title {
-    background: lighten($ui-base-color, 4%);
-  }
-
-  &__meta {
-    background: lighten($ui-base-color, 4%);
-  }
-
-  &__footer {
-    color: $darker-text-color;
-  }
-}
-
-.switch-to-advanced {
-  color: $darker-text-color;
-}
-
-.compose-form .spoiler-input__border {
-  width: 0;
-}
-
-.simple_form {
-  select,
-  textarea,
-  input[type]:not([type='hidden']) {
-    background: darken($ui-base-color, 8%);
-  }
-}

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

@@ -3,23 +3,8 @@ li.selected li.selected a.selected,
 .button,
 .actions button,
 .input-copy button,
-.dropdown-button.active,
 .admin-wrapper .sidebar ul .simple-navigation-active-leaf a {
   color: #000 !important;
-  background: #aaa;
-}
-
-.privacy-dropdown__option.active {
-  color: #000 !important;
-  background: #aaa;
-
-  > .privacy-dropdown__option__content strong {
-    color: #000 !important;
-  }
-
-  > .privacy-dropdown__option__content {
-    color: #000 !important;
-  }
 }
 
 .button.button.button-secondary {
@@ -28,8 +13,8 @@ li.selected li.selected a.selected,
 }
 
 .button.button.button-secondary {
-  color: #fff !important;
-  background: #000 !important;
+  color: #fff!important;
+  background: #000!important;
 }
 
 .button.logo-button {
@@ -40,27 +25,30 @@ li.selected li.selected a.selected,
   fill: #000;
 }
 
-.compose-form__submit .button {
+.search__input {
+  background: #141414;
+}
+
+.drawer__inner,
+.drawer__inner__mastodon {
+  background: #000;
+}
+
+.compose-form__publish-button-wrapper .button {
   color: #fff !important;
   background: #000;
   border: 1px solid #fff !important;
-  transition: 0.1s;
 }
 
-.compose-form__submit .button:hover {
+.compose-form__publish-button-wrapper .button:hover {
   color: #000 !important;
   background: #fff;
-  border: 1px transparent !important;
 }
 
 .icon-with-badge__badge {
   color: #000 !important;
 }
 
-.react-toggle-track {
-  background-color: #444;
-}
-
 .simple_form input[type='email'],
 .simple_form input[type='number'],
 .simple_form input[type='password'],
@@ -83,7 +71,6 @@ li.selected li.selected a.selected,
 .simple_form input[type='password']:focus,
 .simple_form input[type='text']:focus,
 .simple_form textarea:focus {
-  border: 1px solid #fff !important;
   border-radius: 4px;
 }
 
@@ -91,7 +78,3 @@ li.selected li.selected a.selected,
   background: #000 !important;
   color: #fff !important;
 }
-
-.switch-to-advanced {
-  color: #aaa;
-}

app/javascript/styles/mastodon-spring.scss

@@ -1,3 +0,0 @@
-@import 'mastodon-spring/variables';
-@import 'application';
-@import 'mastodon-spring/diff';

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

@@ -1,75 +0,0 @@
-.column {
-  > .scrollable {
-    background: $ui-base-color;
-  }
-
-  .account__header {
-    background: lighten($ui-base-color, 4%);
-
-    &__fields {
-      background: darken($ui-base-color, 4%);
-    }
-  }
-
-  &-back-button,
-  &-header {
-    background: lighten($ui-base-color, 4%);
-
-    &__collapsible {
-      background: lighten($ui-base-color, 8%);
-    }
-  }
-}
-
-.drawer {
-  &__header {
-    background: lighten($ui-base-color, 8%);
-  }
-
-  &__inner {
-    background: lighten($ui-base-color, 13%);
-  }
-
-  &__inner__mastodon {
-    background: lighten($ui-base-color, 13%)
-      url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="%231B331A"/></svg>')
-      no-repeat bottom/100% auto;
-  }
-}
-
-.notification__filter-bar,
-.account__section-headline,
-.content-wrapper,
-.sidebar-wrapper--empty {
-  background: $ui-base-color;
-}
-
-.about {
-  &__section__title {
-    background: lighten($ui-base-color, 4%);
-  }
-
-  &__meta {
-    background: lighten($ui-base-color, 4%);
-  }
-
-  &__footer {
-    color: $darker-text-color;
-  }
-}
-
-.switch-to-advanced {
-  color: $darker-text-color;
-}
-
-.compose-form .spoiler-input__border {
-  width: 0;
-}
-
-.simple_form {
-  select,
-  textarea,
-  input[type]:not([type='hidden']) {
-    background: darken($ui-base-color, 8%);
-  }
-}

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

@@ -1,93 +1,496 @@
-.column {
-  > .scrollable {
-    background: $ui-base-color;
+// Notes!
+// Sass color functions, "darken" and "lighten" are automatically replaced.
+
+html {
+  scrollbar-color: $ui-base-color rgba($ui-base-color, 0.25);
+}
+
+// Change the colors of button texts
+
+.button {
+  background: darken($ui-highlight-color, 10%);
+
+  &.button-alternative-2 {
+    background: darken($ui-highlight-color, 10%);
   }
+}
 
-  .account__header {
-    background: lighten($ui-base-color, 4%);
+.filter-form,
+.directory__card__bar {
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+}
 
-    &__fields {
-      background: darken($ui-base-color, 4%);
+.scrollable .directory__list {
+  width: calc(100% + 2px);
+  margin-left: -1px;
+  margin-right: -1px;
+}
+
+.directory__card,
+.table-of-contents {
+  border: 1px solid lighten($ui-base-color, 8%);
+}
+
+.column-subheading {
+  background: darken($ui-base-color, 4%);
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+}
+
+.getting-started .navigation-bar {
+  border-top: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-top: 0;
+  }
+}
+
+.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;
+}
+
+.compose-form__poll-wrapper select {
+  background: $simple-background-color
+    url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 8%))}'/></svg>")
+    no-repeat right 8px center / auto 16px;
+}
+
+.compose-form__poll-wrapper,
+.compose-form__poll-wrapper .poll__footer {
+  border-top-color: lighten($ui-base-color, 8%);
+}
+
+.notification__filter-bar {
+  border: 1px solid lighten($ui-base-color, 8%);
+  border-top: 0;
+}
+
+.compose-form .compose-form__buttons-wrapper {
+  background: $ui-base-color;
+  border: 1px solid lighten($ui-base-color, 8%);
+  border-top: 0;
+}
+
+// Change the colors used in compose-form
+.compose-form {
+  .compose-form__modifiers {
+    .compose-form__upload__actions .icon-button {
+      color: lighten($white, 7%);
+
+      &:active,
+      &:focus,
+      &:hover {
+        color: $white;
+      }
+    }
+
+    .compose-form__upload-description input {
+      color: lighten($white, 7%);
+
+      &::placeholder {
+        color: lighten($white, 7%);
+      }
     }
   }
 
-  &-back-button,
-  &-header {
-    background: lighten($ui-base-color, 4%);
+  .compose-form__buttons-wrapper {
+    background: darken($ui-base-color, 6%);
+  }
 
-    &__collapsible {
-      background: lighten($ui-base-color, 8%);
+  .autosuggest-textarea__suggestions {
+    background: darken($ui-base-color, 6%);
+  }
+
+  .autosuggest-textarea__suggestions__item {
+    &:hover,
+    &:focus,
+    &:active,
+    &.selected {
+      background: lighten($ui-base-color, 4%);
     }
   }
 }
 
-.drawer {
-  &__header {
-    background: lighten($ui-base-color, 8%);
-  }
+.emoji-mart-bar {
+  border-color: lighten($ui-base-color, 4%);
 
-  &__inner {
-    background: lighten($ui-base-color, 13%);
-  }
-
-  &__inner__mastodon {
-    background: lighten($ui-base-color, 13%)
-      url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="%23FFF0C6"/></svg>')
-      no-repeat bottom/100% auto;
+  &:first-child {
+    background: darken($ui-base-color, 6%);
   }
 }
 
-.notification__filter-bar,
-.account__section-headline,
-.content-wrapper,
-.sidebar-wrapper--empty {
+.emoji-mart-search input {
+  background: rgba($ui-base-color, 0.3);
+  border-color: $ui-base-color;
+}
+
+// Change the background colors of status__content__spoiler-link
+.reply-indicator__content .status__content__spoiler-link,
+.status__content .status__content__spoiler-link {
+  background: $ui-base-color;
+
+  &:hover {
+    background: lighten($ui-base-color, 4%);
+  }
+}
+
+// Change the background colors of media and video spoilers
+.media-spoiler,
+.video-player__spoiler {
   background: $ui-base-color;
 }
 
-.about {
-  &__section__title {
-    background: lighten($ui-base-color, 4%);
+.privacy-dropdown.active .privacy-dropdown__value.active .icon-button {
+  color: $white;
+}
+
+.account-gallery__item a {
+  background-color: $ui-base-color;
+}
+
+// Change the colors used in the dropdown menu
+.dropdown-menu {
+  background: $white;
+
+  &__arrow {
+    &.left {
+      border-left-color: $white;
+    }
+
+    &.top {
+      border-top-color: $white;
+    }
+
+    &.bottom {
+      border-bottom-color: $white;
+    }
+
+    &.right {
+      border-right-color: $white;
+    }
   }
 
-  &__meta {
-    background: lighten($ui-base-color, 4%);
-  }
-
-  &__footer {
-    color: $darker-text-color;
+  &__item {
+    a {
+      background: $white;
+      color: $darker-text-color;
+    }
   }
 }
 
-.switch-to-advanced {
-  color: $darker-text-color;
+// Change the text colors on inverted background
+.privacy-dropdown__option.active,
+.privacy-dropdown__option:hover,
+.privacy-dropdown__option.active .privacy-dropdown__option__content,
+.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
+.privacy-dropdown__option:hover .privacy-dropdown__option__content,
+.privacy-dropdown__option:hover .privacy-dropdown__option__content strong,
+.dropdown-menu__item a:active,
+.dropdown-menu__item a:focus,
+.dropdown-menu__item a:hover,
+.actions-modal ul li:not(:empty) a.active,
+.actions-modal ul li:not(:empty) a.active button,
+.actions-modal ul li:not(:empty) a:active,
+.actions-modal ul li:not(:empty) a:active button,
+.actions-modal ul li:not(:empty) a:focus,
+.actions-modal ul li:not(:empty) a:focus button,
+.actions-modal ul li:not(:empty) a:hover,
+.actions-modal ul li:not(:empty) a:hover button,
+.admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
+.simple_form .block-button,
+.simple_form .button,
+.simple_form button {
+  color: $white;
 }
 
-.compose-form .spoiler-input__border {
-  width: 0;
+.dropdown-menu__separator {
+  border-bottom-color: lighten($ui-base-color, 4%);
+}
+
+// Change the background colors of modals
+.actions-modal,
+.boost-modal,
+.confirmation-modal,
+.mute-modal,
+.block-modal,
+.report-modal,
+.embed-modal,
+.error-modal,
+.onboarding-modal,
+.report-modal__comment .setting-text__wrapper,
+.report-modal__comment .setting-text {
+  background: $white;
+  border: 1px solid lighten($ui-base-color, 8%);
+}
+
+.report-modal__comment {
+  border-right-color: lighten($ui-base-color, 8%);
+}
+
+.report-modal__container {
+  border-top-color: lighten($ui-base-color, 8%);
+}
+
+.column-header__collapsible-inner {
+  background: darken($ui-base-color, 4%);
+  border: 1px solid lighten($ui-base-color, 8%);
+  border-top: 0;
+}
+
+.focal-point__preview strong {
+  color: $white;
+}
+
+.boost-modal__action-bar,
+.confirmation-modal__action-bar,
+.mute-modal__action-bar,
+.block-modal__action-bar,
+.onboarding-modal__paginator,
+.error-modal__footer {
+  background: darken($ui-base-color, 6%);
+
+  .onboarding-modal__nav,
+  .error-modal__nav {
+    &:hover,
+    &:focus,
+    &:active {
+      background-color: darken($ui-base-color, 12%);
+    }
+  }
+}
+
+.display-case__case {
+  background: $white;
+}
+
+.embed-modal .embed-modal__container .embed-modal__html {
+  background: $white;
+  border: 1px solid lighten($ui-base-color, 8%);
+
+  &:focus {
+    border-color: lighten($ui-base-color, 12%);
+    background: $white;
+  }
+}
+
+.react-toggle-track {
+  background: $ui-secondary-color;
+}
+
+.react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
+  background: darken($ui-secondary-color, 10%);
+}
+
+.react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled)
+  .react-toggle-track {
+  background: lighten($ui-highlight-color, 10%);
+}
+
+.tabs-bar {
+  background: $white;
+  border: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 0;
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-top: 0;
+  }
+
+  &__link {
+    padding-bottom: 14px;
+    border-bottom-width: 1px;
+    border-bottom-color: lighten($ui-base-color, 8%);
+
+    &:hover,
+    &:active,
+    &:focus {
+      background: $ui-base-color;
+    }
+
+    &.active {
+      &:hover,
+      &:active,
+      &:focus {
+        background: transparent;
+        border-bottom-color: $ui-highlight-color;
+      }
+    }
+  }
+}
+
+// Change the default colors used on some parts of the profile pages
+
+.box-widget,
+.page-header,
+.directory__tag > a,
+.directory__tag > div,
+.landing-page__call-to-action,
+.contact-widget,
+.landing .hero-widget__text,
+.landing-page__information.contact-widget {
+  background: $white;
+  border: 1px solid lighten($ui-base-color, 8%);
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-left: 0;
+    border-right: 0;
+    border-top: 0;
+  }
+}
+
+.landing .hero-widget__text {
+  border-top: 0;
+  border-bottom: 0;
 }
 
 .simple_form {
-  select,
-  textarea,
-  input[type]:not([type='hidden']) {
-    background: darken($ui-base-color, 8%);
+  input[type='text'],
+  input[type='number'],
+  input[type='email'],
+  input[type='password'],
+  textarea {
+    &:hover {
+      border-color: lighten($ui-base-color, 12%);
+    }
   }
 }
 
-.safety-action-modal {
-  &__top,
-  &__bottom {
-    background: lighten($ui-base-color, 4%);
+.landing .hero-widget__footer {
+  background: $white;
+  border: 1px solid lighten($ui-base-color, 8%);
+  border-top: 0;
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border: 0;
   }
 }
 
-.modal-root__overlay[role='presentation'] {
-  background: rgba($ui-secondary-color, 0.7);
+.brand__tagline {
+  color: $ui-secondary-color;
 }
 
-.btn,
-.button,
-.actions button,
-.input-copy button {
-  color: #000 !important;
+.directory__tag > a {
+  &:hover,
+  &:active,
+  &:focus {
+    background: $ui-base-color;
+  }
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border: 0;
+  }
+}
+
+.directory__tag.active > a,
+.directory__tag.active > div {
+  border-color: $ui-highlight-color;
+
+  &,
+  h4,
+  h4 small,
+  .fa,
+  .trends__item__current {
+    color: $white;
+  }
+
+  &:hover,
+  &:active,
+  &:focus {
+    background: $ui-highlight-color;
+  }
+}
+
+.simple_form,
+.table-form {
+  .warning {
+    box-shadow: none;
+    background: rgba($error-red, 0.5);
+    text-shadow: none;
+  }
+
+  .recommended {
+    border-color: $ui-highlight-color;
+    color: $ui-highlight-color;
+    background-color: rgba($ui-highlight-color, 0.1);
+  }
+}
+
+.compose-form .compose-form__warning {
+  border-color: $ui-highlight-color;
+  background-color: rgba($ui-highlight-color, 0.1);
+
+  &,
+  a {
+    color: $ui-highlight-color;
+  }
+}
+
+.status__content,
+.reply-indicator__content {
+  a {
+    color: $highlight-text-color;
+  }
+}
+
+.button.logo-button {
+  color: $black;
+
+  svg {
+    fill: $black;
+  }
+}
+
+.hero-widget,
+.box-widget,
+.contact-widget,
+.landing-page__information.contact-widget,
+.moved-account-widget,
+.memoriam-widget,
+.activity-stream,
+.nothing-here,
+.directory__tag > a,
+.directory__tag > div,
+.card > a,
+.page-header,
+.compose-form .compose-form__warning {
+  box-shadow: none;
+}
+
+.public-layout {
+  .public-account-header {
+    &__image {
+      background: lighten($ui-base-color, 12%);
+
+      &::after {
+        box-shadow: none;
+      }
+    }
+
+    &__tabs {
+      &__name {
+        h1,
+        h1 small {
+          color: $white;
+
+          @media screen and (max-width: $no-columns-breakpoint) {
+            color: $primary-text-color;
+          }
+        }
+      }
+    }
+  }
+}
+
+.audio-player .video-player__controls button,
+.audio-player .video-player__time-sep,
+.audio-player .video-player__time-current,
+.audio-player .video-player__time-total {
+  color: $primary-text-color;
 }

app/javascript/styles/mastodon-summer/variables.scss

@@ -1,6 +1,6 @@
 // Dependent colors
 $black: #000000;
-$white: #ffeab2;
+$white: #aaaaaa;
 $blurple-600: #b2d8cf;
 $blurple-500: #c6f1e7;
 $blurple-400: #d1f3eb;
@@ -56,7 +56,7 @@ $lighter-text-color: darken($classic-base-color, 10%) !default;
 $light-text-color: #385076;
 
 // Newly added colors
-$account-background-color: $ui-base-color !default;
+$account-background-color: $white !default;
 
 // Invert darkened and lightened colors
 @function darken($color, $amount) {

app/javascript/styles/mastodon-winter.scss

@@ -1,3 +1,2 @@
 @import 'mastodon-winter/variables';
 @import 'application';
-@import 'mastodon-winter/diff';

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

@@ -1,79 +0,0 @@
-.column {
-  > .scrollable {
-    background: $ui-base-color;
-  }
-
-  .account__header {
-    background: lighten($ui-base-color, 4%);
-
-    &__fields {
-      background: darken($ui-base-color, 4%);
-    }
-  }
-
-  &-back-button,
-  &-header {
-    background: lighten($ui-base-color, 4%);
-
-    &__collapsible {
-      background: lighten($ui-base-color, 8%);
-    }
-  }
-}
-
-.drawer {
-  &__header {
-    background: lighten($ui-base-color, 8%);
-  }
-
-  &__inner {
-    background: lighten($ui-base-color, 13%);
-  }
-
-  &__inner__mastodon {
-    background: lighten($ui-base-color, 13%)
-      url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="%23233E5B"/></svg>')
-      no-repeat bottom/100% auto;
-  }
-}
-
-.react-toggle-track {
-  background: $ui-button-background-color;
-}
-
-.notification__filter-bar,
-.account__section-headline,
-.content-wrapper,
-.sidebar-wrapper--empty {
-  background: $ui-base-color;
-}
-
-.about {
-  &__section__title {
-    background: lighten($ui-base-color, 4%);
-  }
-
-  &__meta {
-    background: lighten($ui-base-color, 4%);
-  }
-
-  &__footer {
-    color: $darker-text-color;
-  }
-}
-
-.switch-to-advanced {
-  color: $darker-text-color;
-}
-
-.compose-form .spoiler-input__border {
-  width: 0;
-}
-
-.simple_form {
-  select,
-  textarea,
-  input[type]:not([type='hidden']) {
-    background: darken($ui-base-color, 8%);
-  }
-}

docker-compose.yml

@@ -59,7 +59,7 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.6
+    image: ghcr.io/mastodon/mastodon:v4.3.5
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
     # build:
     #   dockerfile: ./streaming/Dockerfile
     #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.3.6
+    image: ghcr.io/mastodon/mastodon-streaming:v4.3.5
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -102,7 +102,7 @@ services:
   sidekiq:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.6
+    image: ghcr.io/mastodon/mastodon:v4.3.5
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq

lib/mastodon/version.rb

@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      6
+      5
     end
 
     def default_prerelease

lib/redis/namespace_extensions.rb

@@ -5,10 +5,6 @@ class Redis
     def exists?(...)
       call_with_namespace('exists?', ...)
     end
-
-    def with
-      yield self
-    end
   end
 end