Merge branch 'main' of https://github.com/neatchee/mastodon into tmpb…

…ranch/newbranch

# Conflicts:
#	app/javascript/flavours/glitch/styles/mastodon-sakura/diff.scss

app/javascript/flavours/glitch/styles/invert-lightness.scss

@@ -0,0 +1,14 @@
+@import 'lightness-inversions/accounts';
+@import 'lightness-inversions/admin';
+@import 'lightness-inversions/basics';
+@import 'lightness-inversions/components';
+@import 'lightness-inversions/dashboard';
+@import 'lightness-inversions/emoji_picker';
+@import 'lightness-inversions/forms';
+@import 'lightness-inversions/modal';
+@import 'lightness-inversions/modern-urusai-fixes';
+@import 'lightness-inversions/polls';
+@import 'lightness-inversions/rtl';
+@import 'lightness-inversions/tables';
+@import 'lightness-inversions/variables';
+@import 'lightness-inversions/widgets';

app/javascript/flavours/glitch/styles/lightness-inversions/accounts.scss

@@ -0,0 +1,52 @@
+.card {
+  &__bar {
+    img {
+        background: color.adjust($ui-base-color, $lightness: -8%) !important;
+    }
+  }
+}
+
+.simple_form .not_recommended {
+  color: color.adjust($error-red, $lightness: -12%) !important;
+  background-color: rgba(color.adjust($error-red, $lightness: -12%), 0.1) !important;
+  border-color: rgba(color.adjust($error-red, $lightness: -12%), 0.5) !important;
+}
+
+.simple_form .glitch_only {
+  color: color.adjust($warning-red, $lightness: -12%) !important;
+  background-color: rgba(color.adjust($warning-red, $lightness: -12%), 0.1) !important;
+  border-color: rgba(color.adjust($warning-red, $lightness: -12%), 0.5) !important;
+}
+
+.account__header__fields {
+  border-top: 1px solid color.adjust($ui-base-color, $lightness: -12%) !important;
+  border-bottom: 1px solid color.adjust($ui-base-color, $lightness: -12%) !important;
+  dl {
+    border-bottom: 1px solid color.adjust($ui-base-color, $lightness: -12%) !important;
+  }
+  dt {
+    background: rgba(color.adjust($ui-base-color, $lightness: -8%), 0.5) !important;
+  }
+}
+
+.batch-table__row--muted {
+  color: color.adjust($ui-base-color, $lightness: -26%) !important;
+}
+
+.batch-table__row--muted .pending-account__header,
+.batch-table__row--muted .accounts-table,
+.batch-table__row--muted .name-tag {
+  &,
+  a,
+  strong {
+    color: color.adjust($ui-base-color, $lightness: -26%) !important;
+  }
+}
+
+.batch-table__row--muted .accounts-table {
+  tbody td.accounts-table__extra,
+  &__count,
+  &__count small {
+    color: color.adjust($ui-base-color, $lightness: -26%) !important;
+  }
+}

app/javascript/flavours/glitch/styles/lightness-inversions/admin.scss

@@ -0,0 +1,122 @@
+.admin-wrapper {
+  .sidebar {
+    &__toggle {
+      border-bottom: 1px solid color.adjust($ui-base-color, $lightness: -4%) !important;
+    }
+  }
+
+  .content {
+    &__heading {
+      &__tabs {
+        a {
+          &:hover,
+          &:focus,
+          &:active {
+            background: color.adjust($ui-base-color, $lightness: -4%) !important;
+          }
+        }
+      }
+    }
+  }
+}
+
+.filters {
+  .filter-subset {
+    a {
+      &:hover {
+        border-bottom: 2px solid color.adjust($ui-base-color, $lightness: -5%) !important;
+      }
+    }
+  }
+}
+
+a.name-tag,
+.name-tag,
+a.inline-name-tag,
+.inline-name-tag {
+  &.suspended {
+    .username {
+      color: color.adjust($error-red, $lightness: -12%) !important;
+    }
+  }
+}
+
+.speech-bubble {
+  &.negative {
+    border-left-color: color.adjust($error-red, $lightness: -12%) !important;
+  }
+}
+
+.filters-list__item {
+  &.expired {
+    .expiration {
+      color: color.adjust($error-red, $lightness: -12%) !important;
+    }
+  }
+}
+
+.sparkline {
+  &__graph {
+    path:last-child {
+      stroke: color.adjust($highlight-text-color, $lightness: -6%) !important !important;
+    }
+  }
+}
+
+.skeleton {
+  background-image: linear-gradient(
+    90deg,
+    color.adjust($ui-base-color, $lightness: -8%),
+    color.adjust($ui-base-color, $lightness: -12%),
+    color.adjust($ui-base-color, $lightness: -8%)
+  ) !important;
+}
+
+.dimension {
+  &__item {
+    border-bottom: 1px solid color.adjust($ui-base-color, $lightness: -4%) !important;
+  }
+}
+
+.report-reason-selector {
+  &__category {
+    border-bottom: 1px solid color.adjust($ui-base-color, $lightness: -8%) !important;
+  }
+}
+
+.account-card {
+  &__header {
+    img {
+      background: color.adjust($ui-base-color, $lightness: -8%) !important;
+    }
+  }
+
+  &__title {
+    &__avatar {
+      img,
+      .account__avatar {
+        background-color: color.adjust($ui-base-color, $lightness: -8%) !important;
+      }
+    }
+  }
+}
+
+.availability-indicator {
+  &__graphic {
+    &__item {
+      background: color.adjust($ui-base-color, $lightness: -8%) !important;
+    }
+  }
+}
+
+.history {
+  &__entry {
+    .status {
+      border: 1px solid color.adjust($ui-base-color, $lightness: -4%) !important;
+    }
+  }
+}
+
+.status__card {
+  border: 1px solid color.adjust($ui-base-color, $lightness: -4%) !important;
+}

app/javascript/flavours/glitch/styles/lightness-inversions/basics.scss

@@ -0,0 +1,4 @@
+.error-boundary,
+.app-holder noscript {
+  color: color.adjust($error-red, $lightness: -4%) !important;
+}