Re-add Modern theme, with color variants

app/javascript/flavours/glitch/styles/modern.scss

@@ -0,0 +1,5 @@
+@import 'index';
+
+@import 'modern/modern';
+
+@import 'modern/diff';

app/javascript/flavours/glitch/styles/modern/diff.css

@@ -0,0 +1,274 @@
+body.app-body.flavour-glitch
+  > #mastodon
+  .compose-form__autosuggest-wrapper
+  > :last-child {
+  padding-bottom: 2em !important;
+}
+
+body.app-body.flavour-glitch > #mastodon .compose-form__buttons {
+  width: 100%;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .compose-form__buttons
+  > div:last-child {
+  margin-inline-start: auto;
+}
+
+body.app-body.flavour-glitch > #mastodon .compose-form__buttons-wrapper {
+  position: relative;
+}
+
+body.app-body.flavour-glitch > #mastodon .character-counter__wrapper {
+  position: absolute;
+  inset-inline-end: 0;
+  bottom: 100%;
+  margin: 4px;
+  border-radius: 6px;
+  padding: 0.1em 0.5em;
+}
+
+body.app-body.flavour-glitch > #mastodon .character-counter__wrapper span {
+  font-size: 0.9em;
+  font-weight: 500;
+}
+
+body.app-body.flavour-glitch > #mastodon .collapsed .status__content {
+  height: auto !important;
+  overflow: visible;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .collapsed
+  .status__content
+  .status__content__text {
+  mask: linear-gradient(to bottom, #000 50px, transparent) !important;
+  -webkit-mask: linear-gradient(to bottom, #000 50px, transparent) !important;
+  max-height: 100px;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .collapsed
+  .status__content
+  p:not(:last-child) {
+  margin-bottom: 0.4em;
+}
+
+body.app-body.flavour-glitch > #mastodon .collapsed .status__content br {
+  display: block;
+}
+
+body.app-body.flavour-glitch > #mastodon .collapsed .status__content::after {
+  content: unset;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .collapsed.muted
+  .status__content__text
+  ~ * {
+  display: none;
+}
+
+body.app-body.flavour-glitch > #mastodon .status > .status__content {
+  margin-block: -90px -100px !important;
+  padding-block: 100px !important;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .status
+  > .status__content
+  .status__content__text {
+  margin-top: 0;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .status
+  > .status__content
+  > :last-child:not(.status__content__text) {
+  margin-bottom: 5px !important;
+}
+
+body.app-body.flavour-glitch > #mastodon .status .full-width {
+  margin-inline: 0 !important;
+}
+
+body.app-body.flavour-glitch > #mastodon .status .status__action-bar {
+  position: static;
+}
+
+body.app-body.flavour-glitch > #mastodon .status__info .notification__message {
+  padding-top: 0 !important;
+  padding-inline-start: 0 !important;
+}
+
+body.app-body.flavour-glitch > #mastodon .status__display-name {
+  line-height: 22px;
+}
+
+body.app-body.flavour-glitch > #mastodon .display-name__account {
+  font-size: 15px;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .media-gallery__item
+  > .media-gallery__preview {
+  display: unset;
+}
+
+body.app-body.flavour-glitch > #mastodon .status__action-bar-spacer {
+  min-width: 5px;
+}
+
+body.app-body.flavour-glitch > #mastodon .status__relative-time {
+  margin-inline: 5px !important;
+  z-index: 2;
+  flex-grow: 0 !important;
+}
+
+body.app-body.flavour-glitch > #mastodon .reactions-bar {
+  width: unset;
+  margin-top: 8px;
+}
+
+body.app-body.flavour-glitch > #mastodon .reactions-bar button {
+  border-radius: 6px !important;
+  padding-block: 2px;
+}
+@media (pointer: coarse) {
+  body.app-body.flavour-glitch > #mastodon .reactions-bar button {
+    padding: 4px 8px !important;
+  }
+
+  body.app-body.flavour-glitch
+    > #mastodon
+    .reactions-bar
+    button
+    .reactions-bar__item__emoji {
+    height: 18px;
+    width: 18px;
+  }
+}
+
+body.app-body.flavour-glitch > #mastodon .reactions-bar:empty {
+  display: none;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .collapsed
+  > .status__info
+  .notification__message {
+  padding-bottom: 0 !important;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .notification
+  > .notification__message {
+  padding-inline: 15px !important;
+  padding-top: 18px !important;
+}
+
+body.app-body.flavour-glitch > #mastodon .notification .account {
+  padding-inline-start: 0 !important;
+}
+
+body.app-body.flavour-glitch > #mastodon .notification__favourite-icon-wrapper {
+  position: static;
+  margin-inline-end: 10px;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .notification__favourite-icon-wrapper
+  i {
+  width: 1.28571429em !important;
+  text-align: center;
+}
+
+body.app-body.flavour-glitch > #mastodon .status__prepend,
+body.app-body.flavour-glitch > #mastodon .status__info .notification__message {
+  padding-bottom: 15px !important;
+  padding-top: 0 !important;
+  margin-top: -5px !important;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .status__prepend
+  .status__prepend-icon-wrapper,
+body.app-body.flavour-glitch
+  > #mastodon
+  .status__info
+  .notification__message
+  .status__prepend-icon-wrapper {
+  all: unset;
+  margin-inline-end: 10px;
+  display: flex;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .status__prepend
+  .status__prepend-icon-wrapper
+  i,
+body.app-body.flavour-glitch
+  > #mastodon
+  .status__info
+  .notification__message
+  .status__prepend-icon-wrapper
+  i {
+  margin: auto;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .detailed-status__wrapper
+  .focusable:not(.status)::before {
+  content: unset !important;
+}
+
+body.app-body.flavour-glitch > #mastodon .setting-text {
+  border-radius: 0 !important;
+  margin: 4px;
+  width: calc(100% - 8px);
+}
+
+body.app-body.flavour-glitch > #mastodon .column-settings__pillbar {
+  border-radius: var(--radius);
+}
+
+body.app-body.flavour-glitch > #mastodon .pillbar-button {
+  border-radius: 0 !important;
+  padding: 6px;
+}
+
+body.app-body.flavour-glitch > #mastodon .account-card .media-modal__close {
+  left: 10px;
+  top: 10px;
+}
+
+body.app-body.flavour-glitch
+  > #mastodon
+  .account-card
+  .media-modal__close::before {
+  content: '';
+  position: absolute;
+  inset: -60px -30px;
+  background: linear-gradient(to right, #000, transparent);
+  transform: rotate(45deg);
+  z-index: -1;
+  opacity: 0.5;
+}
+
+.layout-multiple-columns.flavour-glitch .drawer__inner {
+  margin-top: -10px;
+  padding-top: 30px !important;
+}

app/javascript/skins/glitch/modern-light/common.scss

@@ -0,0 +1,3 @@
+@import 'flavours/glitch/styles/mastodon-light/variables';
+@import 'flavours/glitch/styles/modern';
+@import 'flavours/glitch/styles/mastodon-light/diff';

app/javascript/skins/glitch/modern-light/names.yml

@@ -0,0 +1,4 @@
+en:
+  skins:
+    glitch:
+      modern-light: Modern (light)

app/javascript/skins/glitch/modern/common.scss

@@ -0,0 +1 @@
+@import 'flavours/glitch/styles/modern';

app/javascript/skins/glitch/modern/names.yml

@@ -0,0 +1,4 @@
+en:
+  skins:
+    glitch:
+      modern: Modern

app/javascript/skins/glitch/wobbl-modern-light/common.scss

@@ -0,0 +1,3 @@
+@import 'flavours/glitch/styles/wobbl-light/variables';
+@import 'flavours/glitch/styles/modern';
+@import 'flavours/glitch/styles/mastodon-light/diff';

app/javascript/skins/glitch/wobbl-modern-light/names.yml

@@ -0,0 +1,4 @@
+en:
+  skins:
+    glitch:
+      wobbl-modern-light: Wobbl Modern (light)

app/javascript/skins/glitch/wobbl-modern/common.scss

@@ -0,0 +1,2 @@
+@import 'flavours/glitch/styles/wobbl/variables';
+@import 'flavours/glitch/styles/modern';

app/javascript/skins/glitch/wobbl-modern/names.yml

@@ -0,0 +1,4 @@
+en:
+  skins:
+    glitch:
+      wobbl-modern: Wobbl Modern

app/javascript/skins/glitch/wobbl-old-modern-light/common.scss

@@ -0,0 +1,3 @@
+@import 'flavours/glitch/styles/wobbl-old-light/variables';
+@import 'flavours/glitch/styles/modern';
+@import 'flavours/glitch/styles/mastodon-light/diff';

app/javascript/skins/glitch/wobbl-old-modern-light/names.yml

@@ -0,0 +1,4 @@
+en:
+  skins:
+    glitch:
+      wobbl-old-modern-light: Wobbl Modern Orange (light)

app/javascript/skins/glitch/wobbl-old-modern/common.scss

@@ -0,0 +1,2 @@
+@import 'flavours/glitch/styles/wobbl-old/variables';
+@import 'flavours/glitch/styles/modern';

app/javascript/skins/glitch/wobbl-old-modern/names.yml

@@ -0,0 +1,4 @@
+en:
+  skins:
+    glitch:
+      wobbl-old-modern: Wobbl Modern Orange

config/webpack/development.js

@@ -18,6 +18,7 @@ module.exports = merge(sharedConfig, {
   mode: 'development',
   cache: true,
   devtool: 'cheap-module-eval-source-map',
+  parallelism: 1,
 
   stats: {
     errorDetails: true,