add <select> to settings pane

i missed these in 7c51ea30a4

Dockerfile

@@ -22,6 +22,9 @@ RUN yarn && yarn build:production
 ### RUNTIME IMAGE ###
 FROM nginx:alpine AS runtime
 
+# Ensure deps up to date.
+RUN apk upgrade --update --no-cache
+
 # Copy bigger nested stuff.
 COPY --from=builder /build/public/packs/js/flavours/glitch /usr/share/nginx/html/packs/js/flavours/glitch
 COPY --from=builder /build/public/packs/js/flavours/vanilla /usr/share/nginx/html/packs/js/flavours/vanilla

app/javascript/flavours/glitch/components/avatar.tsx

@@ -28,7 +28,8 @@ export const Avatar: React.FC<Props> = ({
     ...styleFromParent,
     width: `${size}px`,
     height: `${size}px`,
-    backgroundSize: `${size}px ${size}px`,
+    backgroundSize: "cover",
+    backgroundPosition: "center",
   };
 
   if (account) {

app/javascript/flavours/glitch/components/status_content.jsx

@@ -354,16 +354,12 @@ class StatusContent extends PureComponent {
 
       return (
         <div className={classNames} tabIndex={0} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
-          <p
+          <span dangerouslySetInnerHTML={spoilerContent} className='translate' lang={language} />
-            style={{ marginBottom: hidden && status.get("mentions").isEmpty() ? "0px" : null }}
+          {" "}
-          >
+          <button type='button' className='status__content__spoiler-link' onClick={this.handleSpoilerClick} aria-expanded={!hidden}>
-            <span dangerouslySetInnerHTML={spoilerContent} className='translate' lang={language} />
+            <Icon id={hidden ? "eye-closed" : "eye"} />
-            {" "}
+            {toggleText}
-            <button type='button' className='status__content__spoiler-link' onClick={this.handleSpoilerClick} aria-expanded={!hidden}>
+          </button>
-              <Icon id={hidden ? "eye-closed" : "eye"} />
-              {toggleText}
-            </button>
-          </p>
 
           {mentionsPlaceholder}
 

app/javascript/flavours/glitch/features/local_settings/page/index.jsx

@@ -6,6 +6,7 @@ import { defineMessages, FormattedMessage, injectIntl } from "react-intl";
 
 import ImmutablePropTypes from "react-immutable-proptypes";
 
+import { languages as preloadedLanguages } from "flavours/glitch/initial_state";
 
 //  Our imports
 import LocalSettingsPageItem from "./item";
@@ -35,6 +36,12 @@ const messages = defineMessages({
   direct: { id: "privacy.direct.short", defaultMessage: "Mentioned people only" },
 });
 
+const langs = []
+
+for (const lang of preloadedLanguages) {
+  langs.push({"value": lang[0], "label": lang[1]})
+}
+
 class LocalSettingsPage extends PureComponent {
 
   static propTypes = {
@@ -203,6 +210,16 @@ class LocalSettingsPage extends PureComponent {
     ({ intl, onChange, settings }) => (
       <div className='glitch local-settings__page compose_box_opts'>
         <h1><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box' /></h1>
+        <LocalSettingsPageItem
+          settings={settings}
+          item={["default_language"]}
+          id='mastodon-settings--default-language'
+          select={langs}
+          onChange={onChange}
+        >
+          <FormattedMessage id='settings.default_language' defaultMessage='Default language for new toots' />
+        </LocalSettingsPageItem>
+
         <LocalSettingsPageItem
           settings={settings}
           item={["always_show_spoilers_field"]}

app/javascript/flavours/glitch/features/local_settings/page/item/index.jsx

@@ -39,7 +39,7 @@ export default class LocalSettingsPageItem extends PureComponent {
 
   render () {
     const { handleChange } = this;
-    const { settings, item, id, inputProps, options, children, dependsOn, dependsOnNot, placeholder, disabled } = this.props;
+    const { settings, item, id, inputProps, select, options, children, dependsOn, dependsOnNot, placeholder, disabled } = this.props;
     let enabled = !disabled;
 
     if (dependsOn) {
@@ -53,6 +53,31 @@ export default class LocalSettingsPageItem extends PureComponent {
       }
     }
     
+    if (select && select.length > 0) {
+      const currentValue = settings.getIn(item);
+      const optionElems = select && select.length > 0 && select.map((opt) => {
+        return (
+          <option
+            value={opt.value}
+            selected={currentValue === opt.value}
+          >
+            {opt.label}
+          </option>
+        )
+      })
+      return (
+        <div className='glitch local-settings__page__item select'>
+          <fieldset>
+            <label>Default language:
+              <select>
+                {optionElems}
+              </select>
+            </label>
+          </fieldset>
+        </div>
+      );
+    }
+
     if (options && options.length > 0) {
       const currentValue = settings.getIn(item);
       const optionElems = options && options.length > 0 && options.map((opt) => {

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

@@ -10,7 +10,7 @@
   background-size: $size $size;
 }
 
-@mixin single-column($media, $parent: '&') {
+@mixin single-column($media, $parent: "&") {
   .auto-columns #{$parent} {
     @media #{$media} {
       @content;
@@ -21,7 +21,7 @@
   }
 }
 
-@mixin limited-single-column($media, $parent: '&') {
+@mixin limited-single-column($media, $parent: "&") {
   .auto-columns #{$parent},
   .single-column #{$parent} {
     @media #{$media} {
@@ -30,7 +30,7 @@
   }
 }
 
-@mixin multi-columns($media, $parent: '&') {
+@mixin multi-columns($media, $parent: "&") {
   .auto-columns #{$parent} {
     @media #{$media} {
       @content;
@@ -45,7 +45,7 @@
   &.full-width {
     margin-left: -10px;
     margin-right: -10px;
-    width: inherit;
+    width: calc(100% + 20px);
     max-width: none;
     border-radius: 0;
   }

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

@@ -1,7 +1,7 @@
-$emojis-requiring-inversion: 'back' 'copyright' 'curly_loop' 'currency_exchange'
+$emojis-requiring-inversion: "back" "copyright" "curly_loop" "currency_exchange"
-  'end' 'heavy_check_mark' 'heavy_division_sign' 'heavy_dollar_sign'
+  "end" "heavy_check_mark" "heavy_division_sign" "heavy_dollar_sign"
-  'heavy_minus_sign' 'heavy_multiplication_x' 'heavy_plus_sign' 'on'
+  "heavy_minus_sign" "heavy_multiplication_x" "heavy_plus_sign" "on"
-  'registered' 'soon' 'spider' 'telephone_receiver' 'tm' 'top' 'wavy_dash' !default;
+  "registered" "soon" "spider" "telephone_receiver" "tm" "top" "wavy_dash" !default;
 
 %emoji-color-inversion {
   filter: invert(1);
@@ -9,7 +9,7 @@ $emojis-requiring-inversion: 'back' 'copyright' 'curly_loop' 'currency_exchange'
 
 .emojione {
   @each $emoji in $emojis-requiring-inversion {
-    &[title=':#{$emoji}:'] {
+    &[title=":#{$emoji}:"] {
       @extend %emoji-color-inversion;
     }
   }

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

@@ -1,4 +1,4 @@
-@use 'sass:math';
+@use "sass:math";
 
 $no-columns-breakpoint: 600px;
 $sidebar-width: 240px;
@@ -1456,7 +1456,7 @@ a.sparkline {
 
     &::after {
       display: block;
-      content: '';
+      content: "";
       width: 50px;
       height: 21px;
       position: absolute;
@@ -1850,7 +1850,7 @@ a.sparkline {
 
     &::after {
       position: absolute;
-      content: '';
+      content: "";
       width: 1px;
       background: $highlight-text-color;
       bottom: 0;

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

@@ -1,9 +1,9 @@
 @function hex-color($color) {
-  @if type-of($color) == 'color' {
+  @if type-of($color) == "color" {
     $color: str-slice(ie-hex-str($color), 4);
   }
 
-  @return '%23' + unquote($color);
+  @return "%23" + unquote($color);
 }
 
 body {
@@ -14,7 +14,7 @@ body {
   font-weight: 400;
   color: var(--color-fg);
   text-rendering: optimizelegibility;
-  font-feature-settings: 'kern';
+  font-feature-settings: "kern";
   text-size-adjust: none;
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   -webkit-tap-highlight-color: transparent;
@@ -35,13 +35,13 @@ body {
       system-ui,
       -apple-system,
       BlinkMacSystemFont,
-      'Segoe UI',
+      "Segoe UI",
       Oxygen,
       Ubuntu,
       Cantarell,
-      'Fira Sans',
+      "Fira Sans",
-      'Droid Sans',
+      "Droid Sans",
-      'Helvetica Neue',
+      "Helvetica Neue",
       $font-sans-serif,
       sans-serif;
   }

app/javascript/flavours/glitch/styles/components/accounts.scss

@@ -467,7 +467,7 @@
       width: 2px;
       height: 24px;
       background: var(--color-notifications-lines);
-      content: '';
+      content: "";
     }
   }
 

app/javascript/flavours/glitch/styles/components/columns.scss

@@ -295,7 +295,7 @@ $ui-header-height: 55px;
 
     &::before {
       display: block;
-      content: '';
+      content: "";
       position: absolute;
       bottom: -13px;
       inset-inline-start: 0;

app/javascript/flavours/glitch/styles/components/compose_form.scss

@@ -64,7 +64,7 @@
     &:focus {
       outline: 0;
     }
-    @include single-column('screen and (max-width: 630px)') {
+    @include single-column("screen and (max-width: 630px)") {
       font-size: 16px;
     }
   }
@@ -103,7 +103,7 @@
     color: $highlight-text-color;
   }
 
-  input[type='checkbox'] {
+  input[type="checkbox"] {
     display: none;
   }
 
@@ -240,11 +240,11 @@
         outline: 0;
       }
 
-      @include single-column('screen and (max-width: 630px)') {
+      @include single-column("screen and (max-width: 630px)") {
         font-size: 16px;
       }
 
-      @include limited-single-column('screen and (max-width: 600px)') {
+      @include limited-single-column("screen and (max-width: 600px)") {
         height: 100px !important; // prevent auto-resize textarea
         resize: vertical;
       }

app/javascript/flavours/glitch/styles/components/directory.scss

@@ -42,8 +42,8 @@
   text-overflow: ellipsis;
   cursor: pointer;
 
-  input[type='radio'],
+  input[type="radio"],
-  input[type='checkbox'] {
+  input[type="checkbox"] {
     display: none;
   }
 

app/javascript/flavours/glitch/styles/components/doodle.scss

@@ -35,8 +35,8 @@ $doodle-background: #d9e1e8;
         margin-inline-end: 2px;
       }
 
-      input[type='number'],
+      input[type="number"],
-      input[type='text'] {
+      input[type="text"] {
         width: 40px;
       }
 

app/javascript/flavours/glitch/styles/components/drawer.scss

@@ -16,11 +16,11 @@
     padding-inline-end: 10px;
   }
 
-  @include single-column('screen and (max-width: 630px)') {
+  @include single-column("screen and (max-width: 630px)") {
     flex: auto;
   }
 
-  @include limited-single-column('screen and (max-width: 630px)') {
+  @include limited-single-column("screen and (max-width: 630px)") {
     &,
     &:first-child,
     &:last-child {
@@ -34,7 +34,7 @@
     flex: 1 1 200px;
   }
 
-  @include single-column('screen and (max-width: 630px)') {
+  @include single-column("screen and (max-width: 630px)") {
     :root & {
       //  Overrides `.wide` for single-column view
       flex: auto;
@@ -109,11 +109,11 @@
   flex: none;
 
   @include limited-single-column(
-    'screen and (max-width: #{$no-gap-breakpoint})'
+    "screen and (max-width: #{$no-gap-breakpoint})"
   ) {
     margin-bottom: 0;
   }
-  @include single-column('screen and (max-width: 630px)') {
+  @include single-column("screen and (max-width: 630px)") {
     font-size: 16px;
   }
 }
@@ -299,7 +299,7 @@
   .mbstobon-#{$i} .drawer__inner__mastodon {
     @if $i == 3 {
       background:
-        url('~flavours/glitch/images/wave-drawer.png')
+        url("~flavours/glitch/images/wave-drawer.png")
           no-repeat
           bottom /
           100%
@@ -307,7 +307,7 @@
         lighten($ui-base-color, 4%);
     } @else {
       background:
-        url('~flavours/glitch/images/wave-drawer-glitched.png')
+        url("~flavours/glitch/images/wave-drawer-glitched.png")
           no-repeat
           bottom /
           100%
@@ -316,7 +316,7 @@
     }
 
     & > .mastodon {
-      background: url('~flavours/glitch/images/mbstobon-ui-#{$i}.png')
+      background: url("~flavours/glitch/images/mbstobon-ui-#{$i}.png")
         no-repeat
         left
         bottom /

app/javascript/flavours/glitch/styles/components/emoji_picker.scss

@@ -174,7 +174,7 @@
 
   &:hover::before {
     z-index: 0;
-    content: '';
+    content: "";
     position: absolute;
     top: 0;
     inset-inline-start: 0;

app/javascript/flavours/glitch/styles/components/index.scss

@@ -1,26 +1,26 @@
-@import 'misc';
+@import "misc";
-@import 'boost';
+@import "boost";
-@import 'accounts';
+@import "accounts";
-@import 'domains';
+@import "domains";
-@import 'status';
+@import "status";
-@import 'modal';
+@import "modal";
-@import 'compose_form';
+@import "compose_form";
-@import 'columns';
+@import "columns";
-@import 'regeneration_indicator';
+@import "regeneration_indicator";
-@import 'directory';
+@import "directory";
-@import 'search';
+@import "search";
-@import 'emoji';
+@import "emoji";
-@import 'doodle';
+@import "doodle";
-@import 'drawer';
+@import "drawer";
-@import 'media';
+@import "media";
-@import 'sensitive';
+@import "sensitive";
-@import 'lists';
+@import "lists";
-@import 'emoji_picker';
+@import "emoji_picker";
-@import 'local_settings';
+@import "local_settings";
-@import 'single_column';
+@import "single_column";
-@import 'announcements';
+@import "announcements";
-@import 'explore';
+@import "explore";
-@import 'scrollbars';
+@import "scrollbars";
-@import 'signed_out';
+@import "signed_out";
-@import 'privacy_policy';
+@import "privacy_policy";
-@import 'about';
+@import "about";

app/javascript/flavours/glitch/styles/components/media.scss

@@ -66,7 +66,6 @@
 
 .media-gallery {
   box-sizing: border-box;
-  margin-top: 8px;
   overflow: hidden;
   border-radius: 4px;
   position: relative;
@@ -671,7 +670,7 @@
     }
 
     &::before {
-      content: '';
+      content: "";
       width: 50px;
       background: rgba($white, 0.35);
       border-radius: 4px;
@@ -741,7 +740,7 @@
     position: relative;
 
     &::before {
-      content: '';
+      content: "";
       width: 100%;
       background: rgba($white, 0.35);
       border-radius: 4px;

app/javascript/flavours/glitch/styles/components/misc.scss

@@ -180,7 +180,7 @@
   }
 
   &.disabled {
-    color: darken($action-button-color, 13%);
+    opacity: 0.3;
     background-color: transparent;
     cursor: default;
   }
@@ -223,7 +223,6 @@
     }
 
     &.disabled {
-      color: lighten($lighter-text-color, 7%);
       background-color: transparent;
     }
 
@@ -344,7 +343,7 @@ body > [data-popper-placement] {
 
 .ellipsis {
   &::after {
-    content: '…';
+    content: "…";
   }
 }
 
@@ -471,7 +470,7 @@ body > [data-popper-placement] {
   .image-loader__preview-canvas {
     max-width: $media-modal-media-max-width;
     max-height: $media-modal-media-max-height;
-    background: url('~images/void.png') repeat;
+    background: url("~images/void.png") repeat;
     object-fit: contain;
   }
 
@@ -729,7 +728,7 @@ body > [data-popper-placement] {
   &:hover,
   &:focus,
   &:active {
-    @include multi-columns('screen and (min-width: 631px)') {
+    @include multi-columns("screen and (min-width: 631px)") {
       background: lighten($ui-base-color, 14%);
       border-bottom-color: lighten($ui-base-color, 14%);
     }
@@ -1054,7 +1053,7 @@ body > [data-popper-placement] {
     border-bottom-color: $ui-highlight-color;
   }
 
-  @include limited-single-column('screen and (max-width: 600px)') {
+  @include limited-single-column("screen and (max-width: 600px)") {
     font-size: 16px;
   }
 
@@ -1150,7 +1149,7 @@ button.icon-button.active i.fa-retweet {
   padding-top: 20px + 48px;
 
   .regeneration-indicator__figure {
-    background-image: url('~flavours/glitch/images/elephant_ui_disappointed.svg');
+    background-image: url("~flavours/glitch/images/elephant_ui_disappointed.svg");
   }
 }
 

app/javascript/flavours/glitch/styles/components/modal.scss

@@ -267,7 +267,7 @@
 }
 
 .onboarding-modal__page__wrapper-0 {
-  background: url('~images/elephant_ui_greeting.svg') no-repeat left bottom /
+  background: url("~images/elephant_ui_greeting.svg") no-repeat left bottom /
     auto 250px;
   height: 100%;
   padding: 0;
@@ -1204,7 +1204,7 @@
     width: 100px;
     height: 100px;
     transform: translate(-50%, -50%);
-    background: url('~images/reticle.png') no-repeat 0 0;
+    background: url("~images/reticle.png") no-repeat 0 0;
     border-radius: 50%;
     box-shadow: 0 0 0 9999em rgba($base-shadow-color, 0.35);
   }

app/javascript/flavours/glitch/styles/components/privacy_policy.scss

@@ -87,14 +87,14 @@
     counter-increment: list-counter;
 
     &::before {
-      content: counter(list-counter) '.';
+      content: counter(list-counter) ".";
       position: absolute;
       inset-inline-start: 0;
     }
   }
 
   ul > li::before {
-    content: '';
+    content: "";
     position: absolute;
     background-color: $darker-text-color;
     border-radius: 50%;

app/javascript/flavours/glitch/styles/components/status.scss

@@ -169,12 +169,8 @@
     outline: 0;
     background: lighten($ui-base-color, 4%);
 
-    &.status.status-direct {
+    &.status.status-direct.muted {
-      background: mix(lighten($ui-base-color, 4%), $ui-highlight-color, 95%);
+      background: transparent;
-
-      &.muted {
-        background: transparent;
-      }
     }
 
     .detailed-status,
@@ -219,7 +215,8 @@
   }
 
   &.status-direct {
-    background: mix($ui-base-color, $ui-highlight-color, 95%);
+    --color-status-bg: #{mix($ui-base-color, $ui-highlight-color, 95%)};
+
     border-bottom-color: lighten($ui-base-color, 12%);
   }
 
@@ -277,7 +274,7 @@
         rgba($base-shadow-color, 0.8)
       );
       pointer-events: none;
-      content: '';
+      content: "";
     }
 
     .display-name:hover .display-name__html {
@@ -291,7 +288,7 @@
       padding-top: 0;
 
       &::after {
-        content: '';
+        content: "";
         position: absolute;
         top: 0;
         bottom: 0;
@@ -918,7 +915,7 @@ a.status-card.compact:hover {
 
   &.unread {
     &::before {
-      content: '';
+      content: "";
       position: absolute;
       top: 0;
       inset-inline-start: 0;
@@ -956,7 +953,7 @@ a.status-card.compact:hover {
       height: 100%;
 
       &::before {
-        content: '';
+        content: "";
         display: block;
         position: absolute;
         top: 10px - 4px;

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

@@ -1,3 +1,3 @@
-@import 'contrast/variables';
+@import "contrast/variables";
-@import 'index';
+@import "index";
-@import 'contrast/diff';
+@import "contrast/diff";

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

@@ -309,9 +309,9 @@ code {
       max-width: 100%;
       height: auto;
       border-radius: 4px;
-      background: url('images/void.png');
+      background: url("images/void.png");
 
-      &[src$='missing.png'] {
+      &[src$="missing.png"] {
         visibility: hidden;
       }
 
@@ -404,7 +404,7 @@ code {
         flex: 1 1 auto;
       }
 
-      input[type='checkbox'] {
+      input[type="checkbox"] {
         position: absolute;
         inset-inline-start: 0;
         top: 5px;
@@ -420,12 +420,12 @@ code {
     border-radius: 4px;
   }
 
-  input[type='text'],
+  input[type="text"],
-  input[type='number'],
+  input[type="number"],
-  input[type='email'],
+  input[type="email"],
-  input[type='password'],
+  input[type="password"],
-  input[type='url'],
+  input[type="url"],
-  input[type='datetime-local'],
+  input[type="datetime-local"],
   textarea {
     box-sizing: border-box;
     font-size: 16px;
@@ -463,11 +463,11 @@ code {
     }
   }
 
-  input[type='text'],
+  input[type="text"],
-  input[type='number'],
+  input[type="number"],
-  input[type='email'],
+  input[type="email"],
-  input[type='password'],
+  input[type="password"],
-  input[type='datetime-local'] {
+  input[type="datetime-local"] {
     &:focus:invalid:not(:placeholder-shown),
     &:required:invalid:not(:placeholder-shown) {
       border-color: lighten($error-red, 12%);
@@ -479,11 +479,11 @@ code {
       color: lighten($error-red, 12%);
     }
 
-    input[type='text'],
+    input[type="text"],
-    input[type='number'],
+    input[type="number"],
-    input[type='email'],
+    input[type="email"],
-    input[type='password'],
+    input[type="password"],
-    input[type='datetime-local'],
+    input[type="datetime-local"],
     textarea,
     select {
       border-color: lighten($error-red, 12%);
@@ -619,7 +619,7 @@ code {
       overflow: hidden;
 
       &::after {
-        content: '';
+        content: "";
         display: block;
         position: absolute;
         top: 0;
@@ -1019,7 +1019,7 @@ code {
     flex: 1 1 auto;
   }
 
-  input[type='text'] {
+  input[type="text"] {
     background: transparent;
     border: 0;
     padding: 10px;
@@ -1205,7 +1205,7 @@ code {
     border-color: $highlight-text-color;
 
     &::before {
-      content: '';
+      content: "";
       width: 10px;
       height: 10px;
       border-radius: 50%;

app/javascript/flavours/glitch/styles/gts/_config.scss

@@ -6,8 +6,8 @@
 */
 
 /* 🛠️ Config */
-@import 'colors';
+@import "colors";
-@import 'sizes';
+@import "sizes";
 
 /* 🧩 Components */
-@import 'status';
+@import "status";

app/javascript/flavours/glitch/styles/gts/colors.scss

@@ -70,4 +70,5 @@
     /* Status */
     --color-status-fg: ;
     --color-status-bg: #282c37;
+    --color-status-bg--focus: #313543;
 }

app/javascript/flavours/glitch/styles/gts/media-gallery.scss

@@ -0,0 +1 @@
+/* 🖼️ Media Gallery */

app/javascript/flavours/glitch/styles/gts/status.scss

@@ -1,15 +1,32 @@
 /* 🚥 Status */
-@import 'status/status-account';
+@import "status/status-account";
-@import 'status/status-display-name';
+@import "status/status-display-name";
-@import 'status/status-icons';
+@import "status/status-icons";
-@import 'status/status-info';
+@import "status/status-info";
-@import 'status/status-prepend';
+@import "status/status-prepend";
-@import 'status/status-spoiler';
+@import "status/status-spoiler";
 
-.status__content {
+.status {
+    background-color: var(--color-status-bg);
+
+    &.focusable:focus {
+        --color-status-bg: var(--color-status-bg--focus);
+    }
+}
+
+.status__content,
+.detailed-status .status__content {
     line-height: 1.5;
 }
 
+.status__content p {
+    margin-bottom: 12px;
+}
+
+.media-gallery {
+    margin-top: 16px;
+}
+
 .status__action-bar :is(a, button) {
     color: var(--color-secondary-fg);
 }

app/javascript/flavours/glitch/styles/gts/status/status-icons.scss

@@ -22,7 +22,7 @@
         right: calc(100% + 5px);
         width: 20px;
         height: 100%;
-        content: '';
+        content: "";
         background: linear-gradient(90deg, transparent, var(--color-status-bg));
         transition: all 0.2s;
     }

app/javascript/flavours/glitch/styles/gts/status/status-spoiler.scss

@@ -2,7 +2,6 @@
 .status__content__spoiler-link {
     display: flex;
     gap: 5px;
-    margin-top: 5px;
     padding: 5px 8px;
     border: 1px solid var(--color-accent-lines);
     border-radius: 8px;

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

@@ -1,28 +1,28 @@
-@import 'mixins';
+@import "mixins";
-@import 'variables';
+@import "variables";
-@import 'styles/fonts/roboto';
+@import "styles/fonts/roboto";
-@import 'styles/fonts/roboto-mono';
+@import "styles/fonts/roboto-mono";
 
-@import 'reset';
+@import "reset";
-@import 'basics';
+@import "basics";
-@import 'branding';
+@import "branding";
-@import 'containers';
+@import "containers";
-@import 'lists';
+@import "lists";
-@import 'modal';
+@import "modal";
-@import 'widgets';
+@import "widgets";
-@import 'forms';
+@import "forms";
-@import 'accounts';
+@import "accounts";
-@import 'statuses';
+@import "statuses";
-@import 'components/index';
+@import "components/index";
-@import 'polls';
+@import "polls";
-@import 'about';
+@import "about";
-@import 'tables';
+@import "tables";
-@import 'admin';
+@import "admin";
-@import 'accessibility';
+@import "accessibility";
-@import 'rtl';
+@import "rtl";
-@import 'dashboard';
+@import "dashboard";
-@import 'rich_text';
+@import "rich_text";
 
-@import 'gts';
+@import "gts";
-@import 'gts/config';
+@import "gts/config";
-@import 'tangerine/config';
+@import "tangerine/config";

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

@@ -1,5 +1,5 @@
-@import 'styles/fonts/roboto';
+@import "styles/fonts/roboto";
-@import 'reset';
+@import "reset";
 
 :root {
     --color-bg: #191b22;
@@ -91,7 +91,7 @@ button {
     }
 }
 
-input[type='text'] {
+input[type="text"] {
     display: block;
     margin: 0;
     padding: 15px;

app/javascript/flavours/glitch/styles/mastodon-light.scss

@@ -1,4 +1,4 @@
-@import 'mastodon-light/variables';
+@import "mastodon-light/variables";
-@import 'index';
+@import "index";
-@import 'mastodon-light/diff';
+@import "mastodon-light/diff";
-@import 'mastodon-light/colors';
+@import "mastodon-light/colors";

app/javascript/flavours/glitch/styles/mastodon-light/colors.scss

@@ -40,4 +40,5 @@
   /* Status */
   --color-status-fg: var(--color-fg);
   --color-status-bg: #fff;
+  --color-status-bg--focus: hsl(0deg, 0%, 96%);
 }

app/javascript/flavours/glitch/styles/mastodon-light/diff.scss

@@ -141,7 +141,7 @@ html {
 }
 
 .compose-form__autosuggest-wrapper,
-.poll__option input[type='text'],
+.poll__option input[type="text"],
 .compose-form .spoiler-input__input,
 .compose-form__poll-wrapper select,
 .search__input,
@@ -495,10 +495,10 @@ html {
 }
 
 .simple_form {
-  input[type='text'],
+  input[type="text"],
-  input[type='number'],
+  input[type="number"],
-  input[type='email'],
+  input[type="email"],
-  input[type='password'],
+  input[type="password"],
   textarea {
     &:hover {
       border-color: lighten($ui-base-color, 12%);

app/javascript/flavours/glitch/styles/mastodon-light/variables.scss

@@ -54,4 +54,4 @@ $account-background-color: $white !default;
   @return hsl(hue($color), saturation($color), lightness($color) - $amount);
 }
 
-$emojis-requiring-inversion: 'chains';
+$emojis-requiring-inversion: "chains";

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

@@ -76,8 +76,8 @@
       max-width: calc(100% - 45px - 25px);
     }
 
-    input[type='radio'],
+    input[type="radio"],
-    input[type='checkbox'] {
+    input[type="checkbox"] {
       display: none;
     }
 
@@ -85,7 +85,7 @@
       flex: 1 1 auto;
     }
 
-    input[type='text'] {
+    input[type="text"] {
       display: block;
       box-sizing: border-box;
       width: 100%;
@@ -303,10 +303,6 @@
     padding: 6px 10px;
     padding-inline-end: 30px;
   }
-
-  .icon-button.disabled {
-    color: darken($simple-background-color, 14%);
-  }
 }
 
 .muted .poll {

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

@@ -107,11 +107,11 @@ body.rtl {
   }
 
   .fa-chevron-left::before {
-    content: '\F054';
+    content: "\F054";
   }
 
   .fa-chevron-right::before {
-    content: '\F053';
+    content: "\F053";
   }
 
   .dismissable-banner,

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

@@ -86,7 +86,7 @@
 }
 
 .embed {
-  .status__content[data-spoiler='folded'] {
+  .status__content[data-spoiler="folded"] {
     .e-content {
       display: none;
     }

app/javascript/flavours/glitch/styles/tangerine/_config.scss

@@ -4,7 +4,7 @@
 */
 
 /* 🛠️ Config */
-@import 'keyframes';
+@import "keyframes";
 
 /* 🧩 Components */
-@import 'status-bar';
+@import "status-bar";

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

@@ -83,9 +83,9 @@ $media-modal-media-max-height: 80%;
 
 $no-gap-breakpoint: 1175px;
 
-$font-sans-serif: 'mastodon-font-sans-serif' !default;
+$font-sans-serif: "mastodon-font-sans-serif" !default;
-$font-display: 'mastodon-font-display' !default;
+$font-display: "mastodon-font-display" !default;
-$font-monospace: 'mastodon-font-monospace' !default;
+$font-monospace: "mastodon-font-monospace" !default;
 
 // Avatar border size (8% default, 100% for rounded avatars)
 $ui-avatar-border-size: 8%;

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

@@ -1,4 +1,4 @@
-@use 'sass:math';
+@use "sass:math";
 
 .hero-widget {
   margin-bottom: 10px;

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

@@ -1 +1 @@
-@import 'flavours/glitch/styles/contrast';
+@import "flavours/glitch/styles/contrast";

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

@@ -1 +1 @@
-@import 'flavours/glitch/styles/mastodon-light';
+@import "flavours/glitch/styles/mastodon-light";

app/javascript/styles/fonts/roboto-mono.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: mastodon-font-monospace;
   src:
-    local('Roboto Mono'),
+    local("Roboto Mono"),
-    url('~fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2');
+    url("~fonts/roboto-mono/robotomono-regular-webfont.woff2") format("woff2");
   font-weight: 400;
   font-display: swap;
   font-style: normal;

app/javascript/styles/fonts/roboto.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: mastodon-font-sans-serif;
   src:
-    local('Roboto Italic'),
+    local("Roboto Italic"),
-    url('~fonts/roboto/roboto-italic-webfont.woff2') format('woff2');
+    url("~fonts/roboto/roboto-italic-webfont.woff2") format("woff2");
   font-weight: normal;
   font-display: swap;
   font-style: italic;
@@ -11,8 +11,8 @@
 @font-face {
   font-family: mastodon-font-sans-serif;
   src:
-    local('Roboto Bold'),
+    local("Roboto Bold"),
-    url('~fonts/roboto/roboto-bold-webfont.woff2') format('woff2');
+    url("~fonts/roboto/roboto-bold-webfont.woff2") format("woff2");
   font-weight: bold;
   font-display: swap;
   font-style: normal;
@@ -21,8 +21,8 @@
 @font-face {
   font-family: mastodon-font-sans-serif;
   src:
-    local('Roboto Medium'),
+    local("Roboto Medium"),
-    url('~fonts/roboto/roboto-medium-webfont.woff2') format('woff2');
+    url("~fonts/roboto/roboto-medium-webfont.woff2") format("woff2");
   font-weight: 500;
   font-display: swap;
   font-style: normal;
@@ -31,8 +31,8 @@
 @font-face {
   font-family: mastodon-font-sans-serif;
   src:
-    local('Roboto'),
+    local("Roboto"),
-    url('~fonts/roboto/roboto-regular-webfont.woff2') format('woff2');
+    url("~fonts/roboto/roboto-regular-webfont.woff2") format("woff2");
   font-weight: normal;
   font-display: swap;
   font-style: normal;

public/logo-icon.svg

@@ -1,10 +1,32 @@
-<svg width="65" height="65" viewBox="0 0 61 65" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" width="65px" height="65px" viewBox="0 0 1000 1000">
-<path d="M60.7539 14.3904C59.8143 7.40642 53.7273 1.90257 46.5117 0.836066C45.2943 0.655854 40.6819 0 29.9973 0H29.9175C19.2299 0 16.937 0.655854 15.7196 0.836066C8.70488 1.87302 2.29885 6.81852 0.744617 13.8852C-0.00294988 17.3654 -0.0827298 21.2237 0.0561464 24.7629C0.254119 29.8384 0.292531 34.905 0.753482 39.9598C1.07215 43.3175 1.62806 46.6484 2.41704 49.9276C3.89445 55.9839 9.87499 61.0239 15.7344 63.0801C22.0077 65.2244 28.7542 65.5804 35.2184 64.1082C35.9295 63.9428 36.6318 63.7508 37.3252 63.5321C38.8971 63.0329 40.738 62.4745 42.0913 61.4937C42.1099 61.4799 42.1251 61.4621 42.1358 61.4417C42.1466 61.4212 42.1526 61.3986 42.1534 61.3755V56.4773C42.153 56.4557 42.1479 56.4345 42.1383 56.4151C42.1287 56.3958 42.1149 56.3788 42.0979 56.3655C42.0809 56.3522 42.0611 56.3429 42.04 56.3382C42.019 56.3335 41.9971 56.3336 41.9761 56.3384C37.8345 57.3276 33.5905 57.8234 29.3324 57.8156C22.0045 57.8156 20.0336 54.3384 19.4693 52.8908C19.0156 51.6397 18.7275 50.3346 18.6124 49.0088C18.6112 48.9866 18.6153 48.9643 18.6243 48.9439C18.6333 48.9236 18.647 48.9056 18.6643 48.8915C18.6816 48.8774 18.7019 48.8675 18.7237 48.8628C18.7455 48.858 18.7681 48.8585 18.7897 48.8641C22.8622 49.8465 27.037 50.3423 31.2265 50.3412C32.234 50.3412 33.2387 50.3412 34.2463 50.3146C38.4598 50.1964 42.9009 49.9808 47.0465 49.1713C47.1499 49.1506 47.2534 49.1329 47.342 49.1063C53.881 47.8507 60.1038 43.9097 60.7362 33.9301C60.7598 33.5372 60.8189 29.8148 60.8189 29.4071C60.8218 28.0215 61.2651 19.5781 60.7539 14.3904Z" fill="url(#paint0_linear_89_8)"/>
+  <g style="display:inline">
-<path d="M50.3943 22.237V39.5876H43.5185V22.7481C43.5185 19.2029 42.0411 17.3949 39.036 17.3949C35.7325 17.3949 34.0778 19.5338 34.0778 23.7585V32.9759H27.2434V23.7585C27.2434 19.5338 25.5857 17.3949 22.2822 17.3949C19.2949 17.3949 17.8027 19.2029 17.8027 22.7481V39.5876H10.9298V22.237C10.9298 18.6918 11.835 15.8754 13.6453 13.7877C15.5128 11.7049 17.9623 10.6355 21.0028 10.6355C24.522 10.6355 27.1813 11.9885 28.9542 14.6917L30.665 17.5633L32.3788 14.6917C34.1517 11.9885 36.811 10.6355 40.3243 10.6355C43.3619 10.6355 45.8114 11.7049 47.6847 13.7877C49.4931 15.8734 50.3963 18.6899 50.3943 22.237Z" fill="white"/>
+    <a transform="translate(25.57926,-3.7386984)" style="fill:#df8958;fill-opacity:1">
-<defs>
+      <path style="fill:#df8958;fill-opacity:1;stroke:none;stroke-width:1.27370083;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 874.93713,572.26562 c 48.86899,41.40592 40.34728,101.45707 10.52485,129.11959 13.97126,128.8732 -72.05712,123.63931 -85.90584,74.19625 -42.10717,55.46792 -72.60404,35.57577 -77.65589,32.03573 -51.96671,36.65764 -136.47497,71.97601 -240.97285,71.97601 -89.59324,0 -172.20219,-26.78184 -238.39056,-71.89423 -32.15098,21.46406 -65.35065,8.71172 -84.18505,-21.03475 -67.629744,71.21847 -99.721266,-10.24913 -80.424074,-60.77379 -48.411595,-23.99558 -46.17751,-82.15666 12.295227,-153.26048 -2.180576,-15.02946 -3.305279,-30.35584 -3.305279,-45.91749 0,-135.88894 93.357906,-285.94784 211.454506,-312.79979 -77.19796,-50.31243 3.99462,-110.07858 85.24169,-49.74161 28.00708,-68.054063 97.74919,-68.369668 99.73041,-8.98375 106.79636,-1.72633 166.26831,37.92392 219.52186,65.82946 29.10052,15.24904 64.29039,31.48585 105.32212,33.38127 49.74487,2.29792 75.43664,55.74812 22.5475,97.17667 31.14379,52.43088 43.85611,105.46842 44.20138,220.69091 z"/>
-<linearGradient id="paint0_linear_89_8" x1="30.5" y1="0" x2="30.5" y2="65" gradientUnits="userSpaceOnUse">
+    </a>
-<stop stop-color="#6364FF"/>
+    <g style="display:inline">
-<stop offset="1" stop-color="#563ACC"/>
+      <a style="display:inline" transform="translate(25.57926,-3.7386984)">
-</linearGradient>
+        <path style="fill:#c76c33;fill-opacity:1;stroke:none;stroke-width:1.27370083;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 743.33781,325.62787 c 35.19733,0.11724 57.76192,11.39978 116.3624,-19.00583 -1.67167,14.66536 -10.56068,30.53682 -28.96446,44.95267 2.12839,3.58316 4.17069,7.16916 6.12885,10.77764 -46.77078,-3.85838 -78.36493,-21.25207 -93.52679,-36.72448 z"/>
-</defs>
+      </a>
+      <path style="display:inline;fill:#c76c33;fill-opacity:1;stroke:none;stroke-width:1.27370083;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 807.66056,621.59241 c 11.75962,46.27315 57.03122,77.20017 103.38067,76.0541 13.97126,128.8732 -72.05712,123.63931 -85.90584,74.19625 -42.10717,55.46792 -72.60404,35.57577 -77.65589,32.03573 -51.96671,36.65764 -136.47497,71.97601 -240.97285,71.97601 -89.59324,0 -172.20219,-26.78184 -238.39056,-71.89423 -32.15098,21.46406 -65.35065,8.71172 -84.18505,-21.03475 -67.62974,71.21847 -99.721256,-10.24913 -80.42407,-60.77379 -48.411589,-23.99558 -46.177504,-82.15666 12.29523,-153.26048 -2.18058,-15.02946 -3.30528,-30.35584 -3.30528,-45.91749 0,-135.88894 93.3579,-285.94784 211.4545,-312.79979 -30.61262,-19.95124 -36.3184,-41.38907 -26.99068,-56.23475 12.12303,30.92468 52.84557,58.81622 102.21963,61.73585 -118.73139,38.28818 -82.97185,85.28366 -18.15204,120.50089 87.74275,138.66297 421.24441,197.30557 426.63223,285.41645 z"/>
+    </g>
+  </g>
+  <g style="display:inline">
+    <path style="fill:#e8e7e5;fill-opacity:1;stroke:none;stroke-width:1.43394423;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 360.61328,331.5332 c -21.41421,-0.0154 -44.68515,3.44692 -70.02539,12.66992 -58.84278,21.41684 -89.86969,70.88247 -102.7168,125.14063 37.84456,-27.25765 68.71456,-44.07599 131.24414,-47.40234 101.36096,-5.39205 136.4164,68.63801 137.00586,100.22851 0.63787,34.18509 -13.60697,53.96799 -39.34961,68.18946 -29.74339,16.43165 -91.9066,19.15654 -109.2539,18.90234 -43.39508,-0.63588 -70.18763,-8.00632 -121.61133,-19.12305 28.06087,141.99993 163.20842,229.2793 323.01758,229.2793 159.80915,0 294.9566,-87.27934 323.01758,-229.2793 -51.4167,11.11543 -78.20952,18.4833 -121.60157,19.11914 -17.3473,0.2542 -79.51051,-2.47068 -109.2539,-18.90234 -25.74264,-14.22146 -39.98748,-34.00241 -39.34961,-68.1875 0.58946,-31.5905 35.6449,-105.62252 137.00586,-100.23047 62.52247,3.32598 93.3918,20.14236 131.23047,47.39453 C 817.12364,415.07879 786.09823,365.61838 727.25977,344.20312 625.89881,307.31108 557.6417,362.58944 508.92383,363.92969 472.38543,362.9245 424.85592,331.57953 360.61328,331.5332 Z m 469.35938,137.79883 c 3.04332,12.85002 5.06786,25.96799 6.19922,39.04688 -1.13084,-13.07458 -3.14019,-26.18913 -6.18165,-39.03516 -0.006,-0.004 -0.0118,-0.008 -0.0176,-0.0117 z m 6.19922,39.04688 c 0.0552,0.63773 0.0975,1.2746 0.14843,1.91211 -0.0509,-0.63765 -0.0933,-1.27425 -0.14843,-1.91211 z m 0.14843,1.91211 c 0.14393,1.80126 0.2839,3.60202 0.39453,5.40039 -0.11062,-1.79849 -0.25061,-3.599 -0.39453,-5.40039 z m 0.39453,5.40039 c 0.0184,0.29926 0.0294,0.59733 0.0469,0.89648 -0.0175,-0.29909 -0.0285,-0.59729 -0.0469,-0.89648 z m 0.0469,0.89648 c 0.25991,4.44331 0.42788,8.87639 0.49219,13.2832 0.008,0.52038 0.007,1.03738 0.0117,1.55664 -0.005,-0.52182 0.006,-1.03759 -0.002,-1.56054 -0.0643,-4.40583 -0.24215,-8.83699 -0.50195,-13.2793 z m 0.5039,14.83984 c 0.0152,1.59291 0.0191,3.18135 0.01,4.76368 0.009,-1.58262 0.005,-3.17047 -0.01,-4.76368 z m 0.01,4.76368 c -0.005,0.92204 -0.0136,1.84328 -0.0273,2.76171 0.0137,-0.91841 0.0219,-1.83969 0.0273,-2.76171 z m -0.0273,2.76171 c -0.0252,1.68353 -0.0663,3.35993 -0.11914,5.03126 0.0528,-1.67138 0.094,-3.34769 0.11914,-5.03126 z m -0.11914,5.03126 c -0.0233,0.73697 -0.0417,1.47634 -0.0703,2.21093 0.0287,-0.73482 0.047,-1.47372 0.0703,-2.21093 z m -0.0703,2.21093 c -0.0718,1.83874 -0.16636,3.66651 -0.27148,5.49024 0.10508,-1.82369 0.19976,-3.65154 0.27148,-5.49024 z m -0.27148,5.49024 c -0.0458,0.79542 -0.0904,1.59221 -0.14258,2.38476 0.0522,-0.79288 0.0967,-1.589 0.14258,-2.38476 z m -0.14258,2.38476 c -0.11714,1.77999 -0.2536,3.55098 -0.40234,5.31641 0.14873,-1.76577 0.28523,-3.53607 0.40234,-5.31641 z m -0.40234,5.31641 c -0.0675,0.80136 -0.13697,1.60205 -0.21094,2.40039 0.074,-0.79828 0.14342,-1.59909 0.21094,-2.40039 z m -0.21094,2.40039 c -0.16395,1.769 -0.34549,3.53105 -0.54102,5.28516 0.19549,-1.75414 0.37711,-3.51613 0.54102,-5.28516 z m -0.54102,5.28516 c -0.0851,0.76398 -0.17258,1.52596 -0.26367,2.28711 0.0911,-0.76095 0.17854,-1.52333 0.26367,-2.28711 z m -0.26367,2.28711 c -0.20778,1.73589 -0.42942,3.4645 -0.66797,5.18554 0.23846,-1.7207 0.46027,-3.45 0.66797,-5.18554 z m -0.66797,5.18554 c -0.10825,0.78114 -0.22139,1.55983 -0.33593,2.33789 0.11456,-0.77804 0.22767,-1.55677 0.33593,-2.33789 z m -0.33593,2.33789 c -0.25649,1.74192 -0.52661,3.47865 -0.81446,5.20508 0.28795,-1.72723 0.55789,-3.46234 0.81446,-5.20508 z m -0.81446,5.20508 c -0.11763,0.70559 -0.24044,1.40834 -0.36328,2.11133 0.12287,-0.7031 0.24562,-1.40562 0.36328,-2.11133 z m -0.36328,2.11133 c -0.30505,1.74564 -0.6201,3.48532 -0.95703,5.21484 0.33677,-1.72894 0.65212,-3.46979 0.95703,-5.21484 z m -1.10351,5.93945 c 0.005,-0.001 0.009,-0.003 0.0137,-0.004 0.0451,-0.22839 0.0824,-0.46079 0.12695,-0.68946 -0.0452,0.23198 -0.0948,0.46168 -0.14062,0.69336 z m -646.03516,0 c -0.014,-0.0711 -0.029,-0.14174 -0.043,-0.21289 0.0139,0.0705 0.0251,0.1424 0.0391,0.21289 0.001,2.9e-4 0.003,-2.8e-4 0.004,0 z m 1.96484,-120.79492 c -0.001,10e-4 -0.002,0.003 -0.004,0.004 -0.0237,0.10005 -0.0448,0.20069 -0.0684,0.30078 0.0239,-0.10162 0.0482,-0.2031 0.0723,-0.30469 z"/>
+    <g style="display:inline">
+      <path style="fill:#d3d0d6;fill-opacity:1;stroke:none;stroke-width:0.75590551;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 359.2207,331.53711 c -21.0297,0.13313 -43.8407,3.64251 -68.63281,12.66601 -58.84278,21.41683 -89.86969,70.88247 -102.7168,125.14063 16.8028,-12.10226 32.23569,-22.14013 49.66993,-29.85937 15.94957,-46.5605 58.82838,-86.23574 135.95703,-107.52735 -4.66566,-0.30259 -9.42434,-0.45064 -14.27735,-0.41992 z m -82.85937,275.91016 c -27.80313,-2.91046 -52.38266,-9.07814 -90.45508,-17.3086 28.06087,141.99993 163.20842,229.2793 323.01758,229.2793 139.06045,0 259.44958,-66.08551 306.85547,-176.80664 -220.24022,172.78014 -445.06732,90.22653 -539.41797,-35.16406 z m -90.45508,-17.3086 c -0.014,-0.0711 -0.029,-0.14174 -0.043,-0.21289 0.0139,0.0705 0.0251,0.1424 0.0391,0.21289 10e-4,2.9e-4 0.003,-2.8e-4 0.004,0 z m -0.043,-0.21289 c -0.42064,-2.13766 -0.8137,-4.2908 -1.18555,-6.45312 0.37194,2.16287 0.7648,4.31492 1.18555,6.45312 z m -1.18555,-6.45312 c -0.0521,-0.30294 -0.10512,-0.60479 -0.15625,-0.90821 0.0511,0.3033 0.10418,0.60539 0.15625,0.90821 z m -0.15625,-0.90821 c -0.35775,-2.12297 -0.68974,-4.25786 -1,-6.40429 0.3102,2.14603 0.64233,4.28171 1,6.40429 z m -1,-6.40429 c -0.0484,-0.33517 -0.0973,-0.67013 -0.14453,-1.00586 0.0473,0.33578 0.0961,0.67064 0.14453,1.00586 z m -0.14453,-1.00586 c -0.29701,-2.10911 -0.56958,-4.22988 -0.82031,-6.36133 0.25072,2.13136 0.52331,4.25231 0.82031,6.36133 z m -0.82031,-6.36133 c -0.0453,-0.38521 -0.091,-0.77032 -0.13476,-1.15625 0.0438,0.38584 0.0895,0.77114 0.13476,1.15625 z m -0.13476,-1.15625 c -0.2439,-2.14947 -0.46377,-4.31056 -0.66016,-6.48242 0.19639,2.17176 0.41627,4.33306 0.66016,6.48242 z m -0.66016,-6.48242 c -0.0291,-0.3219 -0.0579,-0.64442 -0.0859,-0.9668 0.0281,0.32238 0.0568,0.64491 0.0859,0.9668 z m -0.0859,-0.9668 c -0.19371,-2.22574 -0.36445,-4.46199 -0.50781,-6.71094 0.14338,2.24937 0.31406,4.48479 0.50781,6.71094 z m -0.50781,-6.71094 c -0.0185,-0.29056 -0.0351,-0.5821 -0.0527,-0.87304 0.0177,0.29091 0.0342,0.58252 0.0527,0.87304 z m -0.0527,-0.87304 c -0.13816,-2.27407 -0.25366,-4.55798 -0.33984,-6.85547 0.0862,2.29731 0.2017,4.58157 0.33984,6.85547 z m -0.33984,-6.85547 c -0.0106,-0.28261 -0.0175,-0.56665 -0.0273,-0.84961 0.01,0.28291 0.0167,0.56705 0.0273,0.84961 z m -0.0273,-0.84961 c -0.0804,-2.31836 -0.13908,-4.64639 -0.16602,-6.98828 0.0269,2.34165 0.0856,4.67016 0.16602,6.98828 z m -0.16602,-6.98828 c -0.002,-0.21622 -0.002,-0.43398 -0.004,-0.65039 0.002,0.21644 10e-4,0.43414 0.004,0.65039 z m -0.004,-0.65039 c -0.023,-2.45059 -0.0205,-4.91265 0.0156,-7.38868 -0.0361,2.47621 -0.0386,4.93792 -0.0156,7.38868 z m 0.0156,-7.38868 c 0.0353,-2.41647 0.10192,-4.84043 0.19531,-7.26953 -0.0934,2.42906 -0.16005,4.85311 -0.19531,7.26953 z m 0.19531,-7.26953 c 0.0316,-0.82227 0.0846,-1.64729 0.12305,-2.4707 -0.0384,0.82333 -0.0914,1.64851 -0.12305,2.4707 z m 0.12305,-2.4707 c 0.0761,-1.6321 0.15074,-3.26473 0.25391,-4.90039 -0.1032,1.63608 -0.17777,3.26787 -0.25391,4.90039 z m 0.25391,-4.90039 c 0.0573,-0.90857 0.13539,-1.81915 0.20117,-2.72852 -0.0658,0.90965 -0.14385,1.81968 -0.20117,2.72852 z m 0.20117,-2.72852 c 0.11133,-1.53917 0.2215,-3.07846 0.35742,-4.61914 -0.13592,1.54067 -0.24609,3.07998 -0.35742,4.61914 z m 0.35742,-4.61914 c 0.16989,-1.92571 0.35542,-3.85104 0.56445,-5.77734 -0.20903,1.92631 -0.39457,3.85161 -0.56445,5.77734 z m 0.56445,-5.77734 c 0.0353,-0.32497 0.073,-0.64966 0.10938,-0.97461 -0.0364,0.32498 -0.0741,0.64961 -0.10938,0.97461 z m 0.10938,-0.97461 c 0.23081,-2.06094 0.48106,-4.12275 0.75781,-6.18164 -0.27679,2.05912 -0.52698,4.12046 -0.75781,6.18164 z m 0.75781,-6.18164 c 0.042,-0.31276 0.0877,-0.62482 0.13086,-0.9375 -0.0431,0.31264 -0.0888,0.62478 -0.13086,0.9375 z m 0.13086,-0.9375 c 0.28598,-2.07402 0.59198,-4.14574 0.92578,-6.21484 -0.33381,2.06916 -0.63979,4.14075 -0.92578,6.21484 z m 0.92578,-6.21484 c 0.0468,-0.28986 0.0968,-0.57942 0.14453,-0.86915 -0.0477,0.28985 -0.0977,0.57918 -0.14453,0.86915 z m 0.14453,-0.86915 c 0.34741,-2.1097 0.71489,-4.21673 1.11328,-6.31835 -0.39841,2.10174 -0.76585,4.20853 -1.11328,6.31835 z m 3.51367,-17.58398 c -0.001,10e-4 -0.002,0.003 -0.004,0.004 -0.0237,0.10005 -0.0448,0.20069 -0.0684,0.30078 0.0239,-0.10162 0.0482,-0.2031 0.0723,-0.30469 z m -0.0723,0.30469 c -0.20333,0.86359 -0.39958,1.7298 -0.59375,2.5957 0.19426,-0.8663 0.39032,-1.73172 0.59375,-2.5957 z m -0.59375,2.5957 c -0.0713,0.318 -0.14672,0.63483 -0.2168,0.95313 0.0701,-0.31813 0.14553,-0.6353 0.2168,-0.95313 z m -0.2168,0.95313 c -0.0525,0.23853 -0.10051,0.4781 -0.15234,0.71679 0.0518,-0.23872 0.0998,-0.47823 0.15234,-0.71679 z m -0.15234,0.71679 c -0.45057,2.07497 -0.87621,4.1565 -1.27539,6.24219 0.39924,-2.086 0.82475,-4.16691 1.27539,-6.24219 z m -1.27539,6.24219 c -0.0271,0.14148 -0.0571,0.2823 -0.084,0.42383 0.0268,-0.14145 0.0569,-0.28243 0.084,-0.42383 z"/>
+    </g>
+  </g>
+  <g style="display:inline">
+    <path style="display:inline;fill:#77889b;fill-opacity:1;stroke:none;stroke-width:1.43394423;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 456.12097,522.17042 c -0.58946,-31.5905 -35.64557,-105.62094 -137.00653,-100.22889 -62.53206,3.32649 -93.40104,20.14605 -131.24764,47.4056 -4.71454,19.91257 -6.98013,40.47051 -7.27278,60.52428 -0.30687,21.02823 1.52971,41.14355 5.3084,60.26647 51.42628,11.1172 78.21828,18.48704 121.61447,19.12294 17.3473,0.2542 79.51037,-2.46948 109.25376,-18.90114 25.74264,-14.22146 39.98819,-34.00417 39.35032,-68.18926 z"/>
+    <path style="display:inline;fill:#77889b;fill-opacity:1;stroke:none;stroke-width:1.43394423;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 561.73598,522.16704 c 0.58946,-31.5905 35.64557,-105.62094 137.00653,-100.22889 62.53205,3.32649 93.40103,20.14605 131.24763,47.4056 4.71454,19.91257 6.98013,40.47051 7.27278,60.52428 0.30687,21.02823 -1.52971,41.14355 -5.3084,60.26647 -51.42628,11.1172 -78.21828,18.48704 -121.61446,19.12294 -17.3473,0.2542 -79.51037,-2.46948 -109.25376,-18.90114 -25.74264,-14.22146 -39.98819,-34.00417 -39.35032,-68.18926 z"/>
+    <g>
+      <path style="display:inline;fill:#5e6f7e;fill-opacity:1;stroke:none;stroke-width:0.37795275;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 237.43625,439.7936 c -17.42268,7.71805 -32.84298,17.75862 -49.63725,29.85493 -4.71454,19.91257 -6.98013,40.47051 -7.27278,60.52428 -0.30687,21.02823 1.52971,41.14355 5.3084,60.26647 38.17445,8.25245 62.77467,14.44 90.66873,17.34101 -36.05239,-46.37747 -53.65303,-109.58404 -39.0671,-167.98669 z"/>
+    </g>
+  </g>
+  <g style="display:inline">
+    <path style="fill:#333a42;fill-opacity:1;stroke:none;stroke-width:0.38498867;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 418.02462,531.32363 c -0.10744,24.12279 -23.30514,29.14016 -31.83071,8.05265 -5.45838,-13.50102 -16.55632,-20.2743 -31.41085,-19.56986 -12.26701,0.58173 -23.66864,10.84681 -26.30026,19.27645 -6.0608,19.41405 -32.59356,16.02724 -33.15921,-3.81754 -0.8008,-28.09463 26.45885,-55.63013 60.73102,-57.2554 34.27218,-1.62528 62.07745,29.19091 61.97001,53.3137 z"/>
+    <path style="fill:#333a42;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 477.57741,594.4761 c -1.97461,-2.44384 -3.44017,-5.35824 -3.85304,-8.47288 -0.41287,-3.11464 0.2963,-6.43124 2.24244,-8.89781 1.34152,-1.70026 3.20435,-2.93742 5.19822,-3.78302 1.99387,-0.84561 4.12458,-1.32004 6.25825,-1.69154 7.08408,-1.23343 14.30962,-1.375 21.50027,-1.375 7.19065,0 14.41619,0.14157 21.50027,1.375 2.13367,0.3715 4.26438,0.84593 6.25825,1.69154 1.99387,0.8456 3.8567,2.08276 5.19822,3.78302 1.94614,2.46657 2.65531,5.78317 2.24244,8.89781 -0.41287,3.11464 -1.87843,6.02904 -3.85304,8.47288 -3.60018,4.45571 -8.83365,7.38979 -14.3328,8.99414 -5.49916,1.60435 -11.28493,1.96418 -17.01334,1.96418 -5.72841,0 -11.51418,-0.35983 -17.01334,-1.96418 -5.49915,-1.60435 -10.73262,-4.53843 -14.3328,-8.99414 z"/>
+    <path style="fill:#333a42;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 483.17544,667.64909 c -10.67287,1.15277 -21.97462,-1.18956 -30.41631,-7.82107 -2.03543,-1.59897 -3.9145,-3.46136 -5.16572,-5.72721 -1.25122,-2.26586 -1.82967,-4.97705 -1.20193,-7.48815 0.58206,-2.32837 2.20003,-4.36298 4.30325,-5.5191 2.10321,-1.15612 4.65677,-1.43588 6.98013,-0.83413 1.61325,0.41783 3.09054,1.23028 4.5962,1.94454 6.05361,2.87173 12.84153,4.21988 19.52458,3.74042 6.68305,-0.47946 13.24293,-2.80135 18.65918,-6.74562 3.3158,-2.41466 6.19803,-5.42285 8.46873,-8.83884 2.2707,3.41599 5.15293,6.42418 8.46873,8.83884 5.41625,3.94427 11.97613,6.26616 18.65918,6.74562 6.68305,0.47946 13.47097,-0.86869 19.52458,-3.74042 1.50566,-0.71426 2.98295,-1.52671 4.5962,-1.94454 2.32336,-0.60175 4.87692,-0.32199 6.98013,0.83413 2.10322,1.15612 3.72119,3.19073 4.30325,5.5191 0.62774,2.5111 0.0493,5.22229 -1.20193,7.48815 -1.25122,2.26585 -3.13029,4.12824 -5.16572,5.72721 -8.44169,6.63151 -19.74344,8.97384 -30.41631,7.82107 -9.27009,-1.00125 -18.25671,-4.51433 -25.74811,-10.06555 -7.4914,5.55122 -16.47802,9.0643 -25.74811,10.06555 z" transform="matrix(-1.1035239,0,0,1,1070.5328,-3.25)"/>
+    <path style="fill:#333a42;fill-opacity:1;stroke:none;stroke-width:0.38498867;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 599.76421,531.07836 c 0.0123,24.12303 23.18998,29.2319 31.79868,8.17819 5.51162,-13.47938 16.6362,-20.20882 31.48783,-19.44577 12.26462,0.63013 23.62566,10.94012 26.22399,19.38008 5.98416,19.43781 32.53007,16.15572 33.17402,-3.68668 0.91165,-28.09125 -26.23914,-55.73409 -60.50463,-57.49459 -34.2655,-1.76049 -62.19214,28.94575 -62.17989,53.06877 z"/>
+  </g>
 </svg>

stylelint.config.js

@@ -36,18 +36,4 @@ module.exports = {
     "scss/dollar-variable-empty-line-before": null,
     "scss/no-global-function-names": null,
   },
-  overrides: [
-    {
-      "files": ["app/javascript/styles/mailer.scss"],
-      rules: {
-        "property-no-unknown": [
-          true,
-          {
-            ignoreProperties: [
-              "/^mso-/",
-            ] },
-        ],
-      },
-    },
-  ],
 };