Merge branch 'stable' into stable-friture

Merge branch 'develop' into stable
2023-04-23 21:06:24 +02:00 · 2023-04-14 18:10:41 +01:00 · 2023-03-11 17:27:22 +00:00 · 2023-02-19 10:00:22 +01:00 · 2023-02-19 09:59:54 +01:00 · 2023-02-11 10:50:04 +00:00
24 changed files with 940 additions and 59 deletions
--- a/images/avi.png
+++ b/images/avi.png
--- a/images/banner.png
+++ b/images/banner.png
--- a/images/city.jpg
+++ b/images/city.jpg
--- a/src/App.scss
+++ b/src/App.scss
@ -477,7 +477,7 @@ textarea,
  position: relative;
  line-height: 2;
  hyphens: none;
-  padding: 0 var(--_padding);
+  padding: .35em var(--_padding);

  &:disabled,
  &[disabled=disabled],
--- a/src/assets/nsfw.png
+++ b/src/assets/nsfw.png
--- a/src/components/about/about.vue
+++ b/src/components/about/about.vue
@ -1,9 +1,9 @@
 <template>
  <div class="column-inner">
    <instance-specific-panel v-if="showInstanceSpecificPanel" />
-    <staff-panel />
    <terms-of-service-panel />
    <LocalBubblePanel v-if="showLocalBubblePanel" />
+    <staff-panel />
    <MRFTransparencyPanel />
    <features-panel v-if="showFeaturesPanel" />
  </div>
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@ -69,6 +69,7 @@
  display: flex;
  flex-direction: column;
  position: relative;
+  margin-bottom: 5px;

  &.with-picker input {
    padding-right: 30px;
@ -78,7 +79,7 @@
    position: absolute;
    top: 0;
    right: 0;
-    margin: .2em .25em;
+    margin: .35em;
    font-size: 1.3em;
    cursor: pointer;
    line-height: 24px;
--- a/src/components/gallery/gallery.js
+++ b/src/components/gallery/gallery.js
@ -91,7 +91,7 @@ const Gallery = {
      if (row.audio) {
        return { 'padding-bottom': '25%' } // fixed reduced height for audio
      } else if (!row.minimal && !row.grid) {
-        return { 'padding-bottom': `${(100 / (row.items.length + 0.6))}%` }
+        return { 'padding-bottom': `${(100 / (row.items.length + 0.77))}%` }
      }
    },
    itemStyle (id, row) {
--- a/src/components/notification/notification.scss
+++ b/src/components/notification/notification.scss
@ -1,10 +1,15 @@
@import '../../_variables.scss';

 .notification-reaction-emoji {
-  width: 40px;
-  display: inline-flex;
+  width: 24px;
+  display: inline;
+  margin-left: 3px;
  vertical-align: middle;
-  flex-direction: column;
+
+  &:hover {
+    transform: scale(2);
+    transition: .1s;
+  }
 }

 // TODO Copypaste from Status, should unify it somehow
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@ -69,15 +69,15 @@
              {{ notification.from_profile.name }}
            </span>
            {{ ' ' }}
-            <span v-if="notification.type === 'like'">
+            <div v-if="notification.type === 'like'">
              <FAIcon
                class="type-icon"
                icon="star"
              />
              {{ ' ' }}
              <small>{{ $t('notifications.favorited_you') }}</small>
-            </span>
-            <span v-if="notification.type === 'repeat'">
+            </div>
+            <div v-if="notification.type === 'repeat'">
              <FAIcon
                class="type-icon"
                icon="retweet"
@ -85,32 +85,32 @@
              />
              {{ ' ' }}
              <small>{{ $t('notifications.repeated_you') }}</small>
-            </span>
-            <span v-if="notification.type === 'follow'">
+            </div>
+            <div v-if="notification.type === 'follow'">
              <FAIcon
                class="type-icon"
                icon="user-plus"
              />
              {{ ' ' }}
              <small>{{ $t('notifications.followed_you') }}</small>
-            </span>
-            <span v-if="notification.type === 'follow_request'">
+            </div>
+            <div v-if="notification.type === 'follow_request'">
              <FAIcon
                class="type-icon"
                icon="user"
              />
              {{ ' ' }}
              <small>{{ $t('notifications.follow_request') }}</small>
-            </span>
-            <span v-if="notification.type === 'move'">
+            </div>
+            <div v-if="notification.type === 'move'">
              <FAIcon
                class="type-icon"
                icon="suitcase-rolling"
              />
              {{ ' ' }}
              <small>{{ $t('notifications.migrated_to') }}</small>
-            </span>
-            <span v-if="notification.type === 'pleroma:emoji_reaction'">
+            </div>
+            <div v-if="notification.type === 'pleroma:emoji_reaction'">
              <small>
                <i18n-t
                  scope="global"
@ -130,15 +130,15 @@
                  </span>
                </i18n-t>
              </small>
-            </span>
-            <span v-if="notification.type === 'poll'">
+            </div>
+            <div v-if="notification.type === 'poll'">
              <FAIcon
                class="type-icon"
                icon="poll-h"
              />
              {{ ' ' }}
              <small>{{ $t('notifications.poll_ended') }}</small>
-            </span>
+            </div>
          </div>
          <div
            v-if="isStatusNotification"
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@ -25,7 +25,7 @@

    &.unseen {
      .notification-overlay {
-        background-image: linear-gradient(135deg, var(--badgeNotification, $fallback--cRed) 4px, transparent 10px)
+        background-image: linear-gradient(135deg, var(--badgeNotification, $fallback--cRed) 3px, transparent 12px)
      }
    }
  }
@ -47,16 +47,24 @@
    border-bottom: none;
  }

+  .status-container {
+    padding: 1.25em 1em;
+
+    &.reply-form {
+      padding: 0 1em 1.25em 1em;
+    }
+  }
+
  .non-mention {
    display: flex;
    flex: 1;
    flex-wrap: nowrap;
-    padding: 0.6em;
+    padding: 1.25em 1em;
    min-width: 0;

    .avatar-container {
-      width: 32px;
-      height: 32px;
+      width: 42px;
+      height: 42px;
    }

    --link: var(--faintLink);
@ -103,7 +111,7 @@

  .notification-right {
    flex: 1;
-    padding-left: 0.8em;
+    padding-left: 1em;
    min-width: 0;

    .timeago {
@ -114,6 +122,7 @@

  .emoji-reaction-emoji {
    font-size: 1.3em;
+    margin-left: 3px;
  }

  .notification-details {
@ -121,7 +130,6 @@
    word-wrap: break-word;
    line-height: var(--post-line-height);
    position: relative;
-    overflow: hidden;
    width: 100%;
    flex: 1 1 0;
    display: flex;
@ -130,13 +138,12 @@

    .name-and-action {
      flex: 1;
-      overflow: hidden;
-      text-overflow: ellipsis;
    }

    .username {
      font-weight: bolder;
      max-width: 100%;
+      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
    }
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -370,7 +370,7 @@
    display: flex;
    justify-content: space-between;
    padding: 0.5em;
-    height: 2.5em;
+    height: 2.75em;

    button {
      width: 10em;
@ -440,7 +440,7 @@
  .visibility-tray {
    display: flex;
    justify-content: space-between;
-    padding-top: 5px;
+    padding-top: 0;
    align-items: baseline;
  }

@ -555,7 +555,7 @@
    overflow: hidden;
    transition: min-height 200ms 100ms;
    // stock padding + 1 line of text (for counter)
-    padding-bottom: calc(var(--_padding) + var(--post-line-height) * 1em);
+    padding-bottom: calc(var(--_padding) + var(--post-line-height) * 1em + .35em);
    // two lines of text
    height: calc(var(--post-line-height) * 1em);
    min-height: calc(var(--post-line-height) * 1em);
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@ -25,7 +25,7 @@

 /* TODO fix order of styles */
 label.Select {
-  padding: 0;
+  padding: .35em;

  select {
    -webkit-appearance: none;
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@ -40,7 +40,7 @@

  .status-container {
    display: flex;
-    padding: var(--status-margin, $status-margin);
+    padding: 1.75em;

    .content {
      overflow: hidden;
@ -72,7 +72,7 @@
  }

  .left-side {
-    margin-right: var(--status-margin, $status-margin);
+    margin-right: 1em;
  }

  .right-side {
@ -260,7 +260,7 @@
  }

  .repeat-info {
-    padding: 0.4em var(--status-margin, $status-margin);
+    padding: 1.75em var(--status-margin, $status-margin) 1em;

    .repeat-icon {
      color: $fallback--cGreen;
@ -368,7 +368,8 @@

  .reply-form {
    padding-top: 0;
-    padding-bottom: 0;
+    padding-bottom: 1em;
+    margin-top: -1.5em;
  }

  .reply-body {
--- a/src/components/status_body/status_body.scss
+++ b/src/components/status_body/status_body.scss
@ -12,12 +12,12 @@
  }
  .emoji {
    --_still_image-label-scale: 0.5;
-    --emoji-size: 38px;
+    --emoji-size: 36px;
  }

  .emoji:hover {
-    transform: scale(1.4);
-    transition: 0.05s;
+    transform: scale(1.33);
+    transition: 0.1s;
  }

  ._mfm_x2_ {
@ -162,7 +162,7 @@

    & .body:not(:active),
    & .attachments {
-      max-height: 3.25em;
+      max-height: 5em;
    }

    .body {
@ -173,10 +173,10 @@

    .body:not(:active) {
      overflow: hidden;
-      mask-size: auto 3.5em, auto auto;
+      mask-size: auto 5em, auto auto;
      mask-position: 0 0, 0 0;
      mask-repeat: repeat-x, repeat;
-      mask-image: linear-gradient(to bottom, white 2em, transparent 3em);
+      mask-image: linear-gradient(to bottom, white 3em, transparent 5em);

      /* Autoprefixed seem to ignore this one, and also syntax is different */
      -webkit-mask-composite: xor;
--- a/src/components/terms_of_service_panel/terms_of_service_panel.vue
+++ b/src/components/terms_of_service_panel/terms_of_service_panel.vue
@ -1,6 +1,11 @@
 <template>
  <div>
    <div class="panel panel-default">
+      <div class="panel-heading">
+        <div class="title">
+          {{ $t("nav.about") }}
+        </div>
+      </div>
      <div class="panel-body">
        <!-- eslint-disable vue/no-v-html -->
        <div
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@ -37,12 +37,12 @@

  display: inline-block;
  position: relative;
-  width: 48px;
-  height: 48px;
+  width: 58px;
+  height: 58px;

  &.-compact {
-    width: 32px;
-    height: 32px;
+    width: 42px;
+    height: 42px;
    border-radius: $fallback--avatarAltRadius;
    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
  }
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@ -1,5 +1,37 @@
@import '../../_variables.scss';

+.user-panel {
+  .user-card {
+    .panel-heading {
+      height: 56px;
+    }
+  }
+
+  .user-info {
+    position: relative;
+    top: .45em;
+    padding: 0 1.3em;
+
+    .container {
+      padding: 0;
+
+      .user-summary {
+        .top-line {
+          margin-top: .2em;
+        }
+
+        .bottom-line {
+          display: none;
+        }
+      }
+    }
+  }
+
+  .post-status-form {
+    margin-top: 1em;
+  }
+}
+
 .user-card {
  position: relative;
  z-index: 10;
@ -35,11 +67,6 @@
    left: 0;
    right: 0;
    bottom: 0;
-    mask: linear-gradient(to top, white, transparent) bottom no-repeat,
-          linear-gradient(to top, white, white);
-    // Autoprefixer seem to ignore this one, and also syntax is different
-    -webkit-mask-composite: xor;
-    mask-composite: exclude;
    background-size: cover;
    mask-size: 100% 60%;
    border-top-left-radius: calc(var(--panelRadius) - 1px);
@ -190,6 +217,8 @@
    flex: 1 1 auto;
    margin-right: 1em;
    font-size: 1.1em;
+    font-weight: bold;
+    text-shadow: 0 0 4px var(--bg);
  }

  .bottom-line {
--- a/static/akko.png
+++ b/static/akko.png
--- a/static/background.jpg
+++ b/static/background.jpg
--- a/static/config.json
+++ b/static/config.json
@ -1,10 +1,10 @@
 {
  "alwaysShowSubjectInput": true,
-  "background": "/static/aurora_borealis.jpg",
-  "collapseMessageWithSubject": false,
-  "greentext": false,
-  "hideFilteredStatuses": false,
-  "hideMutedPosts": false,
+  "background": "/static/background.jpg",
+  "collapseMessageWithSubject": true,
+  "greentext": true,
+  "hideFilteredStatuses": true,
+  "hideMutedPosts": true,
  "hidePostStats": false,
  "hideSitename": false,
  "hideUserStats": false,
@ -21,6 +21,6 @@
  "showInstanceSpecificPanel": false,
  "sidebarRight": false,
  "subjectLineBehavior": "email",
-  "theme": "ihatebeingalive",
+  "theme": "witch-inn",
  "webPushNotifications": false
 }
--- a/static/styles.json
+++ b/static/styles.json
@ -1,4 +1,5 @@
 {
+  "witch-inn": "/static/themes/witch_inn.json",
  "pleroma-dark": "/static/themes/pleroma-dark.json",
  "pleroma-light": "/static/themes/pleroma-light.json",
  "pleroma-amoled": [ "Pleroma Dark AMOLED", "#000000", "#111111", "#b0b0b1", "#d8a070", "#aa0000", "#0fa00f", "#0095ff", "#d59500"],
@ -14,5 +15,6 @@
  "breezy-light": "/static/themes/breezy-light.json",
  "ihatebeingalive": "/static/themes/ihatebeingalive.json",
  "paper": "/static/themes/paper.json",
-  "thekanata": "/static/themes/thekanata.json"
+  "thekanata": "/static/themes/thekanata.json",
+  "charred-coal": "/static/themes/charred-coal.json"
 }
--- a/static/themes/charred-coal.json
+++ b/static/themes/charred-coal.json
@ -0,0 +1,377 @@
+ 
+{
+  "_pleroma_theme_version": 2,
+  "name": "Charred Coal",
+  "theme": {
+    "themeEngineVersion": 3,
+    "shadows": {
+      "panel": [
+        {
+          "x": "1",
+          "y": "1",
+          "blur": "0",
+          "spread": "0",
+          "color": "#000000",
+          "alpha": "0"
+        }
+      ],
+      "topBar": [
+        {
+          "x": 0,
+          "y": "3",
+          "blur": "0",
+          "spread": "1",
+          "color": "#000000",
+          "alpha": "0.35"
+        }
+      ],
+      "popup": [
+        {
+          "x": "3",
+          "y": "3",
+          "blur": "0",
+          "spread": "0",
+          "color": "#000000",
+          "alpha": "0"
+        }
+      ],
+      "avatar": [
+        {
+          "x": 0,
+          "y": 1,
+          "blur": 8,
+          "spread": 0,
+          "color": "#000000",
+          "alpha": 0.7
+        }
+      ],
+      "avatarStatus": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": 0,
+          "inset": false,
+          "color": "#000000",
+          "alpha": "0"
+        }
+      ],
+      "panelHeader": [],
+      "button": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": 0,
+          "inset": false,
+          "color": "#000000",
+          "alpha": "0"
+        }
+      ],
+      "buttonHover": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": "1",
+          "spread": "2",
+          "color": "#888888",
+          "alpha": "0.35",
+          "inset": false
+        }
+      ],
+      "buttonPressed": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": "1",
+          "spread": "2",
+          "color": "#888888",
+          "alpha": "0.1"
+        }
+      ],
+      "input": [
+        {
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": "1",
+          "color": "#888888",
+          "alpha": "0",
+          "inset": true
+        }
+      ]
+    },
+    "colors": {
+      "underlay": "#000000",
+      "bg": "#353535",
+      "fg": "#525252",
+      "cRed": "#a56969",
+      "cOrange": "#afae7a",
+      "cGreen": "#6ca569",
+      "cBlue": "#a4bec8",
+      "accent": "#ffffff",
+      "link": "#ffffff",
+      "text": "#b9b9b9",
+      "badgeNotification": "#a56969",
+      "badgeNotificationText": "#ffffff",
+      "panel": "#525252",
+      "panelText": "#ffffff",
+      "alertNeutral": "#b9b9b9",
+      "alertNeutralPanelText": "#000000",
+      "alertNeutralText": "#ffffff",
+      "alertWarning": "#afae7a",
+      "alertWarningPanelText": "#000000",
+      "alertWarningText": "#ffffff",
+      "alertError": "#a56969",
+      "alertErrorPanelText": "#ffffff",
+      "alertErrorText": "#ffffff",
+      "fgText": "#ffffff",
+      "topBar": "#373737",
+      "topBarText": "#ffffff",
+      "input": "#676767",
+      "inputTopbarText": "#ffffff",
+      "inputPanelText": "#ffffff",
+      "inputText": "#b9b9b9",
+      "btn": "#676767",
+      "btnText": "#ffffff",
+      "btnTopBarText": "#ffffff",
+      "btnDisabled": "#424242",
+      "btnDisabledTopBarText": "#717171",
+      "btnPanelText": "#ffffff",
+      "btnDisabledPanelText": "#717171",
+      "btnDisabledText": "#717171",
+      "btnToggled": "#9a9a9a",
+      "btnToggledTopBarText": "#ffffff",
+      "btnToggledPanelText": "#ffffff",
+      "btnToggledText": "#ffffff",
+      "btnPressed": "#676767",
+      "btnPressedTopBarText": "#ffffff",
+      "btnPressedTopBar": "#676767",
+      "btnPressedPanelText": "#ffffff",
+      "btnPressedPanel": "#676767",
+      "btnPressedText": "#ffffff",
+      "tabActiveText": "#b9b9b9",
+      "tabText": "#ffffff",
+      "tab": "#676767",
+      "fgLink": "#ffffff",
+      "topBarLink": "#b9b9b9",
+      "panelLink": "#ffffff",
+      "panelFaint": "#ffffff",
+      "icon": "#777777",
+      "poll": "#868686",
+      "pollText": "#000000",
+      "border": "#585858",
+      "postLink": "#ffffff",
+      "lightText": "#ececec",
+      "popover": "#353535",
+      "selectedMenuPopover": "#424242",
+      "highlight": "#424242",
+      "highlightText": "#b9b9b9",
+      "selectedMenu": "#424242",
+      "selectedMenuText": "#b9b9b9",
+      "selectedMenuPopoverIcon": "#7e7e7e",
+      "highlightLink": "#ffffff",
+      "selectedMenuLink": "#ffffff",
+      "selectedMenuPopoverLink": "#ffffff",
+      "selectedMenuPopoverText": "#b9b9b9",
+      "faintLink": "#ffffff",
+      "highlightFaintLink": "#ffffff",
+      "selectedMenuFaintLink": "#ffffff",
+      "selectedMenuPopoverFaintLink": "#ffffff",
+      "faint": "#b9b9b9",
+      "highlightFaintText": "#b9b9b9",
+      "selectedMenuFaintText": "#b9b9b9",
+      "selectedMenuPopoverFaintText": "#b9b9b9",
+      "highlightLightText": "#ececec",
+      "selectedMenuLightText": "#ececec",
+      "selectedMenuPopoverLightText": "#ececec",
+      "selectedMenuIcon": "#7e7e7e",
+      "selectedPost": "#424242",
+      "selectedPostText": "#b9b9b9",
+      "selectedPostIcon": "#7e7e7e",
+      "selectedPostLink": "#ffffff",
+      "selectedPostFaintLink": "#ffffff",
+      "highlightPostLink": "#ffffff",
+      "selectedPostPostLink": "#ffffff",
+      "selectedPostLightText": "#ececec",
+      "selectedPostFaintText": "#b9b9b9",
+      "popoverText": "#b9b9b9",
+      "popoverIcon": "#777777",
+      "popoverLink": "#ffffff",
+      "postFaintLink": "#ffffff",
+      "popoverPostFaintLink": "#ffffff",
+      "popoverFaintLink": "#ffffff",
+      "popoverFaintText": "#b9b9b9",
+      "popoverPostLink": "#ffffff",
+      "popoverLightText": "#ececec",
+      "highlightIcon": "#7e7e7e",
+      "highlightPostFaintLink": "#ffffff",
+      "profileTint": "#353535",
+      "profileBg": "#1c1d1f"
+    },
+    "opacity": {
+      "underlay": 0.15,
+      "bg": 0.9,
+      "panel": 0,
+      "alert": 0.5,
+      "input": 0.35,
+      "btn": 0.35,
+      "faint": 0.5,
+      "border": 0,
+      "popover": 1,
+      "profileTint": 0.5
+    },
+    "radii": {
+      "btn": "0",
+      "input": "0",
+      "checkbox": "0",
+      "panel": "0",
+      "avatar": "0",
+      "avatarAlt": "0",
+      "tooltip": "0",
+      "attachment": "0"
+    },
+    "fonts": {
+      "interface": {
+        "family": "sans-serif"
+      },
+      "input": {
+        "family": "inherit"
+      },
+      "post": {
+        "family": "inherit"
+      },
+      "postCode": {
+        "family": "monospace"
+      }
+    }
+  },
+  "source": {
+    "themeEngineVersion": 3,
+    "fonts": {
+      "interface": {
+        "family": "sans-serif"
+      }
+    },
+    "shadows": {
+      "avatarStatus": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": 0,
+          "inset": false,
+          "color": "#000000",
+          "alpha": "0"
+        }
+      ],
+      "button": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": 0,
+          "inset": false,
+          "color": "#000000",
+          "alpha": "0"
+        }
+      ],
+      "buttonHover": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": "1",
+          "spread": "2",
+          "color": "#888888",
+          "alpha": "0.35",
+          "inset": false
+        }
+      ],
+      "buttonPressed": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": "1",
+          "spread": "2",
+          "color": "#888888",
+          "alpha": "0.1"
+        }
+      ],
+      "input": [
+        {
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": "1",
+          "color": "#888888",
+          "alpha": "0",
+          "inset": true
+        }
+      ],
+      "panel": [
+        {
+          "x": "1",
+          "y": "1",
+          "blur": "0",
+          "spread": "0",
+          "color": "#000000",
+          "alpha": "0"
+        }
+      ],
+      "panelHeader": [],
+      "popup": [
+        {
+          "x": "3",
+          "y": "3",
+          "blur": "0",
+          "spread": "0",
+          "color": "#000000",
+          "alpha": "0"
+        }
+      ],
+      "topBar": [
+        {
+          "x": 0,
+          "y": "3",
+          "blur": "0",
+          "spread": "1",
+          "color": "#000000",
+          "alpha": "0.35"
+        }
+      ]
+    },
+    "opacity": {
+      "bg": "0.9",
+      "faint": "0.75",
+      "border": "0",
+      "panel": "0",
+      "btn": "0.35",
+      "input": "0.35"
+    },
+    "colors": {
+      "bg": "#353535",
+      "fg": "#525252",
+      "text": "#b9b9b9",
+      "link": "#ffffff",
+      "cBlue": "#a4bec8",
+      "cRed": "#a56969",
+      "cGreen": "#6ca569",
+      "cOrange": "#afae7a",
+      "topBar": "#373737",
+      "topBarLink": "#b9b9b9",
+      "btn": "#676767",
+      "input": "#676767",
+      "inputText": "#b9b9b9"
+    },
+    "radii": {
+      "btn": "0",
+      "input": "0",
+      "checkbox": "0",
+      "panel": "0",
+      "avatar": "0",
+      "avatarAlt": "0",
+      "tooltip": "0",
+      "attachment": "0"
+    }
+  }
+}
--- a/static/themes/witch_inn.json
+++ b/static/themes/witch_inn.json
@ -0,0 +1,454 @@
+{
+  "name": "Witch' Inn",
+  "_pleroma_theme_version": 2,
+  "theme": {
+    "themeEngineVersion": 3,
+    "shadows": {
+      "panel": [
+        {
+          "color": "#000000",
+          "x": 2,
+          "y": 2,
+          "blur": "1",
+          "spread": 0,
+          "alpha": "0.2"
+        }
+      ],
+      "topBar": [
+        {
+          "color": "#000000",
+          "x": 0,
+          "y": 3,
+          "blur": "0",
+          "spread": 0,
+          "alpha": "0.3"
+        }
+      ],
+      "popup": [
+        {
+          "color": "#000000",
+          "x": 2,
+          "y": 2,
+          "blur": "1",
+          "spread": 0,
+          "alpha": "0.2"
+        }
+      ],
+      "avatar": [
+        {
+          "color": "#ffffff",
+          "x": 0,
+          "y": 0,
+          "blur": "20",
+          "spread": 0,
+          "alpha": "0.3"
+        }
+      ],
+      "avatarStatus": [
+        {
+          "color": "#ffffff",
+          "x": 0,
+          "y": 0,
+          "blur": "20",
+          "spread": 0,
+          "inset": false,
+          "alpha": "0.3"
+        }
+      ],
+      "panelHeader": [],
+      "button": [
+        {
+          "color": "#000000",
+          "x": 0,
+          "y": "0",
+          "blur": 0,
+          "spread": 1,
+          "alpha": "0.2",
+          "inset": true
+        },
+        {
+          "color": "#000000",
+          "x": 0,
+          "y": 2,
+          "blur": 0,
+          "spread": 0,
+          "alpha": "0.3",
+          "inset": false
+        }
+      ],
+      "buttonHover": [
+        {
+          "color": "#3e974e",
+          "x": 0,
+          "y": "0",
+          "blur": 0,
+          "spread": "1",
+          "alpha": "1",
+          "inset": true
+        },
+        {
+          "color": "#3e974e",
+          "x": 0,
+          "y": 2,
+          "blur": 0,
+          "spread": 0,
+          "alpha": "0.6",
+          "inset": false
+        }
+      ],
+      "buttonPressed": [
+        {
+          "color": "#000000",
+          "x": 0,
+          "y": "0",
+          "blur": 0,
+          "spread": "1",
+          "alpha": "0.2",
+          "inset": true
+        },
+        {
+          "color": "#000000",
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": 0,
+          "alpha": "0",
+          "inset": false
+        }
+      ],
+      "input": [
+        {
+          "color": "#000000",
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": 1,
+          "alpha": "0.2",
+          "inset": true
+        }
+      ]
+    },
+    "colors": {
+      "underlay": "#000000",
+      "bg": "#d9cbb3",
+      "fg": "#73392b",
+      "cRed": "#e3312d",
+      "cGreen": "#249d36",
+      "cOrange": "#ef9925",
+      "cBlue": "#2186eb",
+      "accent": "#3e974e",
+      "link": "#3e974e",
+      "text": "#232627",
+      "badgeNotification": "#e3312d",
+      "badgeNotificationText": "#ffffff",
+      "alertNeutral": "#232627",
+      "alertNeutralText": "#ffffff",
+      "alertPopupNeutral": "#232627",
+      "alertPopupNeutralText": "#ffffff",
+      "alertSuccess": "#249d36",
+      "alertSuccessText": "#232627",
+      "alertPopupSuccess": "#249d36",
+      "alertPopupSuccessText": "#ffffff",
+      "alertWarning": "#ef9925",
+      "alertWarningText": "#232627",
+      "alertPopupWarning": "#ef9925",
+      "alertPopupWarningText": "#232627",
+      "alertError": "#e3312d",
+      "alertErrorText": "#232627",
+      "alertPopupError": "#e3312d",
+      "alertPopupErrorText": "#ffffff",
+      "panel": "#73392b",
+      "panelText": "#d8dbdc",
+      "alertNeutralPanelText": "#d8dbdc",
+      "alertSuccessPanelText": "#ffffff",
+      "alertWarningPanelText": "#ffffff",
+      "alertErrorPanelText": "#d8dbdc",
+      "fgText": "#d8dbdc",
+      "topBar": "#73392b",
+      "topBarText": "#d8dbdc",
+      "input": "#e5dbca",
+      "inputTopbarText": "#242628",
+      "inputPanelText": "#242628",
+      "inputText": "#232627",
+      "btn": "#e5dbca",
+      "btnText": "#242628",
+      "btnTopBarText": "#242628",
+      "btnDisabled": "#dccfb9",
+      "btnDisabledTopBarText": "#aea595",
+      "btnPanelText": "#242628",
+      "btnDisabledPanelText": "#aea595",
+      "btnDisabledText": "#aea595",
+      "btnToggled": "#c3ac86",
+      "btnToggledTopBarText": "#242628",
+      "btnToggledPanelText": "#242628",
+      "btnToggledText": "#242628",
+      "btnPressed": "#3e974e",
+      "btnPressedTopBarText": "#ffffff",
+      "btnPressedTopBar": "#3e974e",
+      "btnPressedPanelText": "#ffffff",
+      "btnPressedPanel": "#3e974e",
+      "btnPressedText": "#ffffff",
+      "tabActiveText": "#232627",
+      "tabText": "#242628",
+      "tab": "#e5dbca",
+      "fgLink": "#69c179",
+      "topBarLink": "#d8dbdc",
+      "panelLink": "#3f974f",
+      "panelFaint": "#d8dbdc",
+      "icon": "#7e796d",
+      "poll": "#9bb78b",
+      "pollText": "#232627",
+      "border": "#6c3629",
+      "postCyantext": "#1579de",
+      "postGreentext": "#5c835a",
+      "postLink": "#69c179",
+      "lightText": "#000000",
+      "popover": "#d9cbb3",
+      "selectedMenuPopover": "#3e974e",
+      "highlight": "#d1c0a2",
+      "highlightText": "#232627",
+      "selectedMenu": "#e5dbca",
+      "selectedMenuText": "#337b40",
+      "selectedMenuPopoverIcon": "#398947",
+      "highlightLink": "#69c179",
+      "selectedMenuLink": "#3f974f",
+      "selectedMenuPopoverLink": "#69c179",
+      "selectedMenuPopoverText": "#ffffff",
+      "faintLink": "#3e974e",
+      "highlightFaintLink": "#69c179",
+      "selectedMenuFaintLink": "#3f974f",
+      "selectedMenuPopoverFaintLink": "#69c179",
+      "faint": "#232627",
+      "highlightFaintText": "#232627",
+      "selectedMenuFaintText": "#232627",
+      "selectedMenuPopoverFaintText": "#ffffff",
+      "highlightLightText": "#000000",
+      "selectedMenuLightText": "#000000",
+      "selectedMenuPopoverLightText": "#000000",
+      "selectedMenuIcon": "#8cab85",
+      "selectedPost": "#d1c0a2",
+      "selectedPostText": "#232627",
+      "selectedPostIcon": "#7a7365",
+      "selectedPostLink": "#3f974f",
+      "selectedPostFaintLink": "#3f974f",
+      "highlightPostLink": "#3f974f",
+      "selectedPostPostLink": "#69c179",
+      "selectedPostLightText": "#000000",
+      "selectedPostFaintText": "#232627",
+      "popoverText": "#232627",
+      "popoverIcon": "#7e796d",
+      "popoverLink": "#69c179",
+      "postFaintLink": "#69c179",
+      "popoverPostFaintLink": "#3f974f",
+      "popoverFaintLink": "#69c179",
+      "popoverFaintText": "#232627",
+      "popoverPostLink": "#3f974f",
+      "popoverLightText": "#000000",
+      "highlightIcon": "#7a7365",
+      "highlightPostFaintLink": "#3f974f",
+      "profileTint": "#d9cbb3",
+      "profileBg": "#737169",
+      "wallpaper": "#ddd0ba"
+    },
+    "opacity": {
+      "underlay": 0,
+      "bg": 0.95,
+      "alert": 0.5,
+      "alertPopup": 0.95,
+      "panel": 1,
+      "input": 1,
+      "btn": 1,
+      "faint": 0.5,
+      "border": 0.15,
+      "popover": 1,
+      "profileTint": 0.5
+    },
+    "radii": {
+      "btn": "3",
+      "input": "3",
+      "checkbox": "3",
+      "panel": "4",
+      "avatar": "4",
+      "avatarAlt": "4",
+      "tooltip": "3",
+      "attachment": "4"
+    },
+    "fonts": {
+      "interface": {
+        "family": "sans-serif"
+      },
+      "input": {
+        "family": "inherit"
+      },
+      "post": {
+        "family": "inherit"
+      },
+      "postCode": {
+        "family": "monospace"
+      }
+    }
+  },
+  "source": {
+    "themeEngineVersion": 3,
+    "fonts": {},
+    "shadows": {
+      "panel": [
+        {
+          "x": 2,
+          "y": 2,
+          "blur": "1",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.2"
+        }
+      ],
+      "button": [
+        {
+          "x": 0,
+          "y": "0",
+          "blur": 0,
+          "spread": 1,
+          "color": "--btn,900",
+          "alpha": "0.2",
+          "inset": true
+        },
+        {
+          "x": 0,
+          "y": 2,
+          "blur": 0,
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.3",
+          "inset": false
+        }
+      ],
+      "panelHeader": [],
+      "buttonHover": [
+        {
+          "x": 0,
+          "y": "0",
+          "blur": 0,
+          "spread": "1",
+          "color": "--accent",
+          "alpha": "1",
+          "inset": true
+        },
+        {
+          "x": 0,
+          "y": 2,
+          "blur": 0,
+          "spread": 0,
+          "color": "--accent",
+          "alpha": "0.6",
+          "inset": false
+        }
+      ],
+      "buttonPressed": [
+        {
+          "x": 0,
+          "y": "0",
+          "blur": 0,
+          "spread": "1",
+          "color": "--btn,900",
+          "alpha": "0.2",
+          "inset": true
+        },
+        {
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": 0,
+          "color": "--btn,900",
+          "alpha": "0",
+          "inset": false
+        }
+      ],
+      "input": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": 1,
+          "color": "--input,900",
+          "alpha": "0.2",
+          "inset": true
+        }
+      ],
+      "topBar": [
+        {
+          "x": 0,
+          "y": 3,
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.3"
+        }
+      ],
+      "popup": [
+        {
+          "x": 2,
+          "y": 2,
+          "blur": "1",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.2"
+        }
+      ],
+      "avatarStatus": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": "20",
+          "spread": 0,
+          "inset": false,
+          "color": "#ffffff",
+          "alpha": "0.3"
+        }
+      ],
+      "avatar": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": "20",
+          "spread": 0,
+          "color": "#ffffff",
+          "alpha": "0.3"
+        }
+      ]
+    },
+    "opacity": {
+      "bg": "0.95",
+      "underlay": "0",
+      "border": "0.15",
+      "input": "1"
+    },
+    "colors": {
+      "bg": "#d9cbb3",
+      "fg": "#73392b",
+      "text": "#232627",
+      "accent": "#3E974E",
+      "cBlue": "#2186eb",
+      "cRed": "#e3312d",
+      "cGreen": "#249d36",
+      "cOrange": "#ef9925",
+      "selectedMenu": "--bg, -6.5",
+      "selectedMenuText": "#337b40",
+      "selectedMenuPopover": "--accent",
+      "postGreentext": "#5c835a",
+      "topBarLink": "--topBarText",
+      "btn": "--bg, -6.5",
+      "btnPressed": "--accent",
+      "input": "--bg,-6.5"
+    },
+    "radii": {
+      "btn": "3",
+      "input": "3",
+      "checkbox": "3",
+      "panel": "4",
+      "avatar": "4",
+      "avatarAlt": "4",
+      "tooltip": "3",
+      "attachment": "4"
+    }
+  }
+}
Author	SHA1	Message	Date
Fristi	25e895e5bc	Merge branch 'stable' into stable-friture	2023-04-23 21:06:24 +02:00
FloatingGhost	9aa64d82c9	Merge branch 'develop' into stable	2023-04-14 18:10:41 +01:00
FloatingGhost	85abc62213	Merge branch 'develop' into stable	2023-03-11 17:27:22 +00:00
Fristi	4ff2ca8ed1	Merge branch 'testing' into stable-friture	2023-02-19 10:00:22 +01:00
Fristi	fe07c22b1c	Merge branch 'stable' into testing	2023-02-19 09:59:54 +01:00
FloatingGhost	8569b5946e	Merge branch 'develop' into stable	2023-02-11 10:50:04 +00:00
Fristi	70f0e16c37	Merge branch 'testing' into stable-friture	2022-12-11 21:41:25 +01:00
Fristi	8dbe3899e6	Merge branch 'stable' into testing	2022-12-11 21:40:45 +01:00
FloatingGhost	9c9b4cc07c	Merge branch 'develop' into stable	2022-12-10 14:52:00 +00:00
Fristi	c1a66802c6	Merge branch 'testing' into stable-friture	2022-11-15 20:28:49 +01:00
Fristi	ff19f85a48	Merge branch 'stable' into testing	2022-11-15 20:28:18 +01:00
floatingghost	2c9b73646c	Merge pull request 'hotfix: mfm mysteries' (#215 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#215	2022-11-15 16:01:07 +00:00
floatingghost	80a519d7e4	Merge pull request 'hotfix: translation' (#207 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#207	2022-11-12 19:08:20 +00:00
floatingghost	975f04bf5a	Merge pull request '2022.11 stable release' (#202 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#202	2022-11-12 15:33:57 +00:00
Fristi	6123537643	Merge branch 'testing' into stable-friture	2022-10-09 18:40:04 +02:00
Fristi	42c6b17785	Merge branch 'stable' into testing # Conflicts: # src/components/about/about.vue	2022-10-09 18:39:31 +02:00
floatingghost	c8c8d40827	Merge pull request '2022.10 stable' (#177 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#177	2022-10-08 11:13:01 +00:00
Fristi	1bf7b2c20b	Merge branch 'testing' into stable-friture	2022-09-18 13:21:10 +02:00
Fristi	2a5413f4a5	Merge branch 'stable' into testing	2022-09-18 13:20:26 +02:00
Fristi	d49f52d875	Merge branch 'stable' into stable-friture	2022-09-12 20:28:09 +02:00
floatingghost	d7499a1f91	Merge pull request '2022.09 stable' (#160 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#160	2022-09-10 14:39:13 +00:00
Fristi	6b82c87454	Added Witch' Inn theme and set it as the default.	2022-08-20 22:53:34 +02:00
Fristi	dcc249ba7c	Merge branch 'testing' into stable-friture # Conflicts: # src/components/notification/notification.scss # src/components/status_body/status_body.scss	2022-08-13 13:07:36 +02:00
Fristi	4768cfdd2b	Merge branch 'stable' into testing # Conflicts: # src/components/about/about.vue # src/components/status_body/status_body.scss	2022-08-13 13:05:00 +02:00
floatingghost	5972d89117	Merge pull request 'stable release' (#130 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#130	2022-08-12 15:26:51 +00:00
Fristi	a4481b3e05	Merge branch 'testing' into stable-friture	2022-08-11 23:32:46 +02:00
Fristi	e2f8738156	Added fixes for text masking in statuses and notifications.	2022-08-11 23:29:48 +02:00
Fristi	247ce0b006	Added several margin, padding and sizing improvements to statuses, notifications, galleries and forms. + increased padding around statuses to 1.75em + slightly increased margin between status and avatar + increased avatar size in statuses to 58px, 42px for compact view + decreased emoji size to 36px, adding scaleup on hover + increased padding around notifications to 1.25em/1em + moved notification action below username + decreased emoji size in notification details to 24px, adding scaleup on hover + single image attachements will now have the container sized to 16:9 proportions + added fix so that emoji scaleup in actions don't fall below other elements	2022-08-08 23:21:05 +02:00
Fristi	04e0917fd2	Added default image materials, added a new style "Charred Coal".	2022-07-31 21:12:51 +02:00
Fristi	699bee9328	Updated user panel with a new look. Updated form inputs to have a little more padding, reworked margins a little.	2022-07-31 20:52:58 +02:00
Fristi	02d76bf6a3	Updated terms_of_service_panel.vue to display the TOS panel first, added panel header to the panel.	2022-07-31 20:40:08 +02:00
floatingghost	d03872d598	Merge pull request 'port MFM link into stable docs' (#38 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#38	2022-07-15 13:02:06 +00:00