LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-22 12:21:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into darkly-tweak

Browse source
This commit is contained in:
SleeplessOne1917 2023-07-07 18:24:49 +00:00 committed by GitHub
commit 14cd758d11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 565 additions and 471 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lemmy-translations

@ -1 +1 @@
Subproject commit a241fe1255a6363c7ae1ec5a09520c066745e6ce Subproject commit 713ceed9c7ef84deaa222e68361e670e0763cd83

5
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "lemmy-ui", "name": "lemmy-ui",
"version": "0.18.1-rc.10", "version": "0.18.1",
"description": "An isomorphic UI for lemmy", "description": "An isomorphic UI for lemmy",
"repository": "https://github.com/LemmyNet/lemmy-ui", "repository": "https://github.com/LemmyNet/lemmy-ui",
"license": "AGPL-3.0", "license": "AGPL-3.0",
@ -67,7 +67,7 @@
"inferno-router": "^8.1.1", "inferno-router": "^8.1.1",
"inferno-server": "^8.1.1", "inferno-server": "^8.1.1",
"jwt-decode": "^3.1.2", "jwt-decode": "^3.1.2",
"lemmy-js-client": "0.18.0-rc.2", "lemmy-js-client": "0.18.1",
"lodash.isequal": "^4.5.0", "lodash.isequal": "^4.5.0",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
"markdown-it": "^13.0.1", "markdown-it": "^13.0.1",
@ -75,6 +75,7 @@
"markdown-it-emoji": "^2.0.2", "markdown-it-emoji": "^2.0.2",
"markdown-it-footnote": "^3.0.3", "markdown-it-footnote": "^3.0.3",
"markdown-it-html5-embed": "^1.0.0", "markdown-it-html5-embed": "^1.0.0",
"markdown-it-ruby": "^0.1.1",
"markdown-it-sub": "^1.0.0", "markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0", "markdown-it-sup": "^1.0.0",
"mini-css-extract-plugin": "^2.7.5", "mini-css-extract-plugin": "^2.7.5",

5
src/assets/css/main.css
View file

@ -204,6 +204,11 @@ blockquote {
height: 5rem; height: 5rem;
} }
.mobile-thumbnail-container .thumbnail {
width: 100%;
height: auto;
}
.thumbnail svg { .thumbnail svg {
height: 1.25rem; height: 1.25rem;
width: 1.25rem; width: 1.25rem;

2
src/assets/css/themes/_variables.i386.scss
View file

@ -26,7 +26,7 @@ $danger: #aa0000;
$info: #00aaaa; $info: #00aaaa;
$warning: #aa00aa; $warning: #aa00aa;
$light: $gray-800; $light: $gray-800;
$dark: black; $dark: $gray-300;
$body-bg: #000084; $body-bg: #000084;
$body-color: $gray-300; $body-color: $gray-300;

1
src/assets/css/themes/_variables.vaporwave-dark.scss
View file

@ -9,6 +9,7 @@ $gray-800: #303030;
$gray-900: #222; $gray-900: #222;
$light: $gray-700; $light: $gray-700;
$dark: $gray-200;
$body-bg: $gray-900; $body-bg: $gray-900;
$body-color: $gray-200; $body-color: $gray-200;

224
src/assets/css/themes/i386.css
View file

@ -26,35 +26,35 @@
--bs-gray-400: #ced4da; --bs-gray-400: #ced4da;
--bs-gray-500: #adb5bd; --bs-gray-500: #adb5bd;
--bs-gray-600: #6c757d; --bs-gray-600: #6c757d;
--bs-gray-700: #495057; --bs-gray-700: #444;
--bs-gray-800: #303030; --bs-gray-800: #303030;
--bs-gray-900: #222; --bs-gray-900: #2f2f2f;
--bs-primary: #fefe54; --bs-primary: #fefe54;
--bs-secondary: #222; --bs-secondary: #303030;
--bs-success: #00aa00; --bs-success: #00aa00;
--bs-info: #00aaaa; --bs-info: #00aaaa;
--bs-warning: #aa00aa; --bs-warning: #aa00aa;
--bs-danger: #aa0000; --bs-danger: #aa0000;
--bs-light: #303030; --bs-light: #444;
--bs-dark: black; --bs-dark: #bbb;
--bs-primary-rgb: 254, 254, 84; --bs-primary-rgb: 254, 254, 84;
--bs-secondary-rgb: 34, 34, 34; --bs-secondary-rgb: 48, 48, 48;
--bs-success-rgb: 0, 170, 0; --bs-success-rgb: 0, 170, 0;
--bs-info-rgb: 0, 170, 170; --bs-info-rgb: 0, 170, 170;
--bs-warning-rgb: 170, 0, 170; --bs-warning-rgb: 170, 0, 170;
--bs-danger-rgb: 170, 0, 0; --bs-danger-rgb: 170, 0, 0;
--bs-light-rgb: 48, 48, 48; --bs-light-rgb: 68, 68, 68;
--bs-dark-rgb: 0, 0, 0; --bs-dark-rgb: 187, 187, 187;
--bs-primary-text-emphasis: #666622; --bs-primary-text-emphasis: #666622;
--bs-secondary-text-emphasis: #0e0e0e; --bs-secondary-text-emphasis: #131313;
--bs-success-text-emphasis: #004400; --bs-success-text-emphasis: #004400;
--bs-info-text-emphasis: #004444; --bs-info-text-emphasis: #004444;
--bs-warning-text-emphasis: #440044; --bs-warning-text-emphasis: #440044;
--bs-danger-text-emphasis: #440000; --bs-danger-text-emphasis: #440000;
--bs-light-text-emphasis: #495057; --bs-light-text-emphasis: #444;
--bs-dark-text-emphasis: #495057; --bs-dark-text-emphasis: #444;
--bs-primary-bg-subtle: #ffffdd; --bs-primary-bg-subtle: #ffffdd;
--bs-secondary-bg-subtle: lightgray; --bs-secondary-bg-subtle: #d6d6d6;
--bs-success-bg-subtle: #cceecc; --bs-success-bg-subtle: #cceecc;
--bs-info-bg-subtle: #cceeee; --bs-info-bg-subtle: #cceeee;
--bs-warning-bg-subtle: #eeccee; --bs-warning-bg-subtle: #eeccee;
@ -62,7 +62,7 @@
--bs-light-bg-subtle: #fcfcfd; --bs-light-bg-subtle: #fcfcfd;
--bs-dark-bg-subtle: #ced4da; --bs-dark-bg-subtle: #ced4da;
--bs-primary-border-subtle: #ffffbb; --bs-primary-border-subtle: #ffffbb;
--bs-secondary-border-subtle: #a7a7a7; --bs-secondary-border-subtle: #acacac;
--bs-success-border-subtle: #99dd99; --bs-success-border-subtle: #99dd99;
--bs-info-border-subtle: #99dddd; --bs-info-border-subtle: #99dddd;
--bs-warning-border-subtle: #dd99dd; --bs-warning-border-subtle: #dd99dd;
@ -129,8 +129,8 @@
color-scheme: dark; color-scheme: dark;
--bs-body-color: #adb5bd; --bs-body-color: #adb5bd;
--bs-body-color-rgb: 173, 181, 189; --bs-body-color-rgb: 173, 181, 189;
--bs-body-bg: #222; --bs-body-bg: #2f2f2f;
--bs-body-bg-rgb: 34, 34, 34; --bs-body-bg-rgb: 47, 47, 47;
--bs-emphasis-color: #fff; --bs-emphasis-color: #fff;
--bs-emphasis-color-rgb: 255, 255, 255; --bs-emphasis-color-rgb: 255, 255, 255;
--bs-secondary-color: rgba(173, 181, 189, 0.75); --bs-secondary-color: rgba(173, 181, 189, 0.75);
@ -139,10 +139,10 @@
--bs-secondary-bg-rgb: 48, 48, 48; --bs-secondary-bg-rgb: 48, 48, 48;
--bs-tertiary-color: rgba(173, 181, 189, 0.5); --bs-tertiary-color: rgba(173, 181, 189, 0.5);
--bs-tertiary-color-rgb: 173, 181, 189; --bs-tertiary-color-rgb: 173, 181, 189;
--bs-tertiary-bg: #292929; --bs-tertiary-bg: #303030;
--bs-tertiary-bg-rgb: 41, 41, 41; --bs-tertiary-bg-rgb: 48, 48, 48;
--bs-primary-text-emphasis: #fefe98; --bs-primary-text-emphasis: #fefe98;
--bs-secondary-text-emphasis: #7a7a7a; --bs-secondary-text-emphasis: #838383;
--bs-success-text-emphasis: #66cc66; --bs-success-text-emphasis: #66cc66;
--bs-info-text-emphasis: #66cccc; --bs-info-text-emphasis: #66cccc;
--bs-warning-text-emphasis: #cc66cc; --bs-warning-text-emphasis: #cc66cc;
@ -150,7 +150,7 @@
--bs-light-text-emphasis: #f8f9fa; --bs-light-text-emphasis: #f8f9fa;
--bs-dark-text-emphasis: #bbb; --bs-dark-text-emphasis: #bbb;
--bs-primary-bg-subtle: #333311; --bs-primary-bg-subtle: #333311;
--bs-secondary-bg-subtle: #070707; --bs-secondary-bg-subtle: #0a0a0a;
--bs-success-bg-subtle: #002200; --bs-success-bg-subtle: #002200;
--bs-info-bg-subtle: #002222; --bs-info-bg-subtle: #002222;
--bs-warning-bg-subtle: #220022; --bs-warning-bg-subtle: #220022;
@ -158,12 +158,12 @@
--bs-light-bg-subtle: #303030; --bs-light-bg-subtle: #303030;
--bs-dark-bg-subtle: #181818; --bs-dark-bg-subtle: #181818;
--bs-primary-border-subtle: #989832; --bs-primary-border-subtle: #989832;
--bs-secondary-border-subtle: #141414; --bs-secondary-border-subtle: #1d1d1d;
--bs-success-border-subtle: #006600; --bs-success-border-subtle: #006600;
--bs-info-border-subtle: #006666; --bs-info-border-subtle: #006666;
--bs-warning-border-subtle: #660066; --bs-warning-border-subtle: #660066;
--bs-danger-border-subtle: #660000; --bs-danger-border-subtle: #660000;
--bs-light-border-subtle: #495057; --bs-light-border-subtle: #444;
--bs-dark-border-subtle: #303030; --bs-dark-border-subtle: #303030;
--bs-heading-color: inherit; --bs-heading-color: inherit;
--bs-link-color: #fefe98; --bs-link-color: #fefe98;
@ -171,7 +171,7 @@
--bs-link-color-rgb: 254, 254, 152; --bs-link-color-rgb: 254, 254, 152;
--bs-link-hover-color-rgb: 254, 254, 173; --bs-link-hover-color-rgb: 254, 254, 173;
--bs-code-color: #fe98fe; --bs-code-color: #fe98fe;
--bs-border-color: #495057; --bs-border-color: #444;
--bs-border-color-translucent: rgba(255, 255, 255, 0.15); --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
--bs-form-valid-color: #99ff99; --bs-form-valid-color: #99ff99;
--bs-form-valid-border-color: #99ff99; --bs-form-valid-border-color: #99ff99;
@ -1942,13 +1942,13 @@ progress {
.table-secondary { .table-secondary {
--bs-table-color: #000; --bs-table-color: #000;
--bs-table-bg: lightgray; --bs-table-bg: #d6d6d6;
--bs-table-border-color: #bebebe; --bs-table-border-color: #c1c1c1;
--bs-table-striped-bg: #c8c8c8; --bs-table-striped-bg: #cbcbcb;
--bs-table-striped-color: #000; --bs-table-striped-color: #000;
--bs-table-active-bg: #bebebe; --bs-table-active-bg: #c1c1c1;
--bs-table-active-color: #000; --bs-table-active-color: #000;
--bs-table-hover-bg: #c3c3c3; --bs-table-hover-bg: #c6c6c6;
--bs-table-hover-color: #000; --bs-table-hover-color: #000;
color: var(--bs-table-color); color: var(--bs-table-color);
border-color: var(--bs-table-border-color); border-color: var(--bs-table-border-color);
@ -2012,28 +2012,28 @@ progress {
.table-light { .table-light {
--bs-table-color: #fff; --bs-table-color: #fff;
--bs-table-bg: #303030; --bs-table-bg: #444;
--bs-table-border-color: #454545; --bs-table-border-color: #575757;
--bs-table-striped-bg: #3a3a3a; --bs-table-striped-bg: #4d4d4d;
--bs-table-striped-color: #fff; --bs-table-striped-color: #fff;
--bs-table-active-bg: #454545; --bs-table-active-bg: #575757;
--bs-table-active-color: #fff; --bs-table-active-color: #fff;
--bs-table-hover-bg: #404040; --bs-table-hover-bg: #525252;
--bs-table-hover-color: #fff; --bs-table-hover-color: #fff;
color: var(--bs-table-color); color: var(--bs-table-color);
border-color: var(--bs-table-border-color); border-color: var(--bs-table-border-color);
} }
.table-dark { .table-dark {
--bs-table-color: #fff; --bs-table-color: #000;
--bs-table-bg: black; --bs-table-bg: #bbb;
--bs-table-border-color: #1a1a1a; --bs-table-border-color: #a8a8a8;
--bs-table-striped-bg: #0d0d0d; --bs-table-striped-bg: #b2b2b2;
--bs-table-striped-color: #fff; --bs-table-striped-color: #000;
--bs-table-active-bg: #1a1a1a; --bs-table-active-bg: #a8a8a8;
--bs-table-active-color: #fff; --bs-table-active-color: #000;
--bs-table-hover-bg: #131313; --bs-table-hover-bg: #adadad;
--bs-table-hover-color: #fff; --bs-table-hover-color: #000;
color: var(--bs-table-color); color: var(--bs-table-color);
border-color: var(--bs-table-border-color); border-color: var(--bs-table-border-color);
} }
@ -2933,19 +2933,19 @@ textarea.form-control-lg {
.btn-secondary { .btn-secondary {
--bs-btn-color: #fff; --bs-btn-color: #fff;
--bs-btn-bg: #222; --bs-btn-bg: #303030;
--bs-btn-border-color: #222; --bs-btn-border-color: #303030;
--bs-btn-hover-color: #fff; --bs-btn-hover-color: #fff;
--bs-btn-hover-bg: #1d1d1d; --bs-btn-hover-bg: #292929;
--bs-btn-hover-border-color: #1b1b1b; --bs-btn-hover-border-color: #262626;
--bs-btn-focus-shadow-rgb: 67, 67, 67; --bs-btn-focus-shadow-rgb: 79, 79, 79;
--bs-btn-active-color: #fff; --bs-btn-active-color: #fff;
--bs-btn-active-bg: #1b1b1b; --bs-btn-active-bg: #262626;
--bs-btn-active-border-color: #1a1a1a; --bs-btn-active-border-color: #242424;
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
--bs-btn-disabled-color: #fff; --bs-btn-disabled-color: #fff;
--bs-btn-disabled-bg: #222; --bs-btn-disabled-bg: #303030;
--bs-btn-disabled-border-color: #222; --bs-btn-disabled-border-color: #303030;
} }
.btn-success { .btn-success {
@ -3018,36 +3018,36 @@ textarea.form-control-lg {
.btn-light { .btn-light {
--bs-btn-color: #fff; --bs-btn-color: #fff;
--bs-btn-bg: #303030; --bs-btn-bg: #444;
--bs-btn-border-color: #303030; --bs-btn-border-color: #444;
--bs-btn-hover-color: #fff; --bs-btn-hover-color: #fff;
--bs-btn-hover-bg: #292929; --bs-btn-hover-bg: #3a3a3a;
--bs-btn-hover-border-color: #262626; --bs-btn-hover-border-color: #363636;
--bs-btn-focus-shadow-rgb: 79, 79, 79; --bs-btn-focus-shadow-rgb: 96, 96, 96;
--bs-btn-active-color: #fff; --bs-btn-active-color: #fff;
--bs-btn-active-bg: #262626; --bs-btn-active-bg: #363636;
--bs-btn-active-border-color: #242424; --bs-btn-active-border-color: #333333;
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
--bs-btn-disabled-color: #fff; --bs-btn-disabled-color: #fff;
--bs-btn-disabled-bg: #303030; --bs-btn-disabled-bg: #444;
--bs-btn-disabled-border-color: #303030; --bs-btn-disabled-border-color: #444;
} }
.btn-dark { .btn-dark {
--bs-btn-color: #fff; --bs-btn-color: #000;
--bs-btn-bg: black; --bs-btn-bg: #bbb;
--bs-btn-border-color: black; --bs-btn-border-color: #bbb;
--bs-btn-hover-color: #fff; --bs-btn-hover-color: #000;
--bs-btn-hover-bg: #262626; --bs-btn-hover-bg: #c5c5c5;
--bs-btn-hover-border-color: #1a1a1a; --bs-btn-hover-border-color: #c2c2c2;
--bs-btn-focus-shadow-rgb: 38, 38, 38; --bs-btn-focus-shadow-rgb: 159, 159, 159;
--bs-btn-active-color: #fff; --bs-btn-active-color: #000;
--bs-btn-active-bg: #333333; --bs-btn-active-bg: #c9c9c9;
--bs-btn-active-border-color: #1a1a1a; --bs-btn-active-border-color: #c2c2c2;
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
--bs-btn-disabled-color: #fff; --bs-btn-disabled-color: #000;
--bs-btn-disabled-bg: black; --bs-btn-disabled-bg: #bbb;
--bs-btn-disabled-border-color: black; --bs-btn-disabled-border-color: #bbb;
} }
.btn-outline-primary { .btn-outline-primary {
@ -3068,19 +3068,19 @@ textarea.form-control-lg {
} }
.btn-outline-secondary { .btn-outline-secondary {
--bs-btn-color: #222; --bs-btn-color: #303030;
--bs-btn-border-color: #222; --bs-btn-border-color: #303030;
--bs-btn-hover-color: #fff; --bs-btn-hover-color: #fff;
--bs-btn-hover-bg: #222; --bs-btn-hover-bg: #303030;
--bs-btn-hover-border-color: #222; --bs-btn-hover-border-color: #303030;
--bs-btn-focus-shadow-rgb: 34, 34, 34; --bs-btn-focus-shadow-rgb: 48, 48, 48;
--bs-btn-active-color: #fff; --bs-btn-active-color: #fff;
--bs-btn-active-bg: #222; --bs-btn-active-bg: #303030;
--bs-btn-active-border-color: #222; --bs-btn-active-border-color: #303030;
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
--bs-btn-disabled-color: #222; --bs-btn-disabled-color: #303030;
--bs-btn-disabled-bg: transparent; --bs-btn-disabled-bg: transparent;
--bs-btn-disabled-border-color: #222; --bs-btn-disabled-border-color: #303030;
--bs-gradient: none; --bs-gradient: none;
} }
@ -3153,36 +3153,36 @@ textarea.form-control-lg {
} }
.btn-outline-light { .btn-outline-light {
--bs-btn-color: #303030; --bs-btn-color: #444;
--bs-btn-border-color: #303030; --bs-btn-border-color: #444;
--bs-btn-hover-color: #fff; --bs-btn-hover-color: #fff;
--bs-btn-hover-bg: #303030; --bs-btn-hover-bg: #444;
--bs-btn-hover-border-color: #303030; --bs-btn-hover-border-color: #444;
--bs-btn-focus-shadow-rgb: 48, 48, 48; --bs-btn-focus-shadow-rgb: 68, 68, 68;
--bs-btn-active-color: #fff; --bs-btn-active-color: #fff;
--bs-btn-active-bg: #303030; --bs-btn-active-bg: #444;
--bs-btn-active-border-color: #303030; --bs-btn-active-border-color: #444;
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
--bs-btn-disabled-color: #303030; --bs-btn-disabled-color: #444;
--bs-btn-disabled-bg: transparent; --bs-btn-disabled-bg: transparent;
--bs-btn-disabled-border-color: #303030; --bs-btn-disabled-border-color: #444;
--bs-gradient: none; --bs-gradient: none;
} }
.btn-outline-dark { .btn-outline-dark {
--bs-btn-color: black; --bs-btn-color: #bbb;
--bs-btn-border-color: black; --bs-btn-border-color: #bbb;
--bs-btn-hover-color: #fff; --bs-btn-hover-color: #000;
--bs-btn-hover-bg: black; --bs-btn-hover-bg: #bbb;
--bs-btn-hover-border-color: black; --bs-btn-hover-border-color: #bbb;
--bs-btn-focus-shadow-rgb: 0, 0, 0; --bs-btn-focus-shadow-rgb: 187, 187, 187;
--bs-btn-active-color: #fff; --bs-btn-active-color: #000;
--bs-btn-active-bg: black; --bs-btn-active-bg: #bbb;
--bs-btn-active-border-color: black; --bs-btn-active-border-color: #bbb;
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
--bs-btn-disabled-color: black; --bs-btn-disabled-color: #bbb;
--bs-btn-disabled-bg: transparent; --bs-btn-disabled-bg: transparent;
--bs-btn-disabled-border-color: black; --bs-btn-disabled-border-color: #bbb;
--bs-gradient: none; --bs-gradient: none;
} }
@ -6490,7 +6490,7 @@ textarea.form-control-lg {
.text-bg-secondary { .text-bg-secondary {
color: #fff !important; color: #fff !important;
background-color: RGBA(34, 34, 34, var(--bs-bg-opacity, 1)) !important; background-color: RGBA(48, 48, 48, var(--bs-bg-opacity, 1)) !important;
} }
.text-bg-success { .text-bg-success {
@ -6515,12 +6515,12 @@ textarea.form-control-lg {
.text-bg-light { .text-bg-light {
color: #fff !important; color: #fff !important;
background-color: RGBA(48, 48, 48, var(--bs-bg-opacity, 1)) !important; background-color: RGBA(68, 68, 68, var(--bs-bg-opacity, 1)) !important;
} }
.text-bg-dark { .text-bg-dark {
color: #fff !important; color: #000 !important;
background-color: RGBA(0, 0, 0, var(--bs-bg-opacity, 1)) !important; background-color: RGBA(187, 187, 187, var(--bs-bg-opacity, 1)) !important;
} }
.link-primary { .link-primary {
@ -6537,8 +6537,8 @@ textarea.form-control-lg {
text-decoration-color: RGBA(var(--bs-secondary-rgb), var(--bs-link-underline-opacity, 1)) !important; text-decoration-color: RGBA(var(--bs-secondary-rgb), var(--bs-link-underline-opacity, 1)) !important;
} }
.link-secondary:hover, .link-secondary:focus { .link-secondary:hover, .link-secondary:focus {
color: RGBA(27, 27, 27, var(--bs-link-opacity, 1)) !important; color: RGBA(38, 38, 38, var(--bs-link-opacity, 1)) !important;
text-decoration-color: RGBA(27, 27, 27, var(--bs-link-underline-opacity, 1)) !important; text-decoration-color: RGBA(38, 38, 38, var(--bs-link-underline-opacity, 1)) !important;
} }
.link-success { .link-success {
@ -6582,8 +6582,8 @@ textarea.form-control-lg {
text-decoration-color: RGBA(var(--bs-light-rgb), var(--bs-link-underline-opacity, 1)) !important; text-decoration-color: RGBA(var(--bs-light-rgb), var(--bs-link-underline-opacity, 1)) !important;
} }
.link-light:hover, .link-light:focus { .link-light:hover, .link-light:focus {
color: RGBA(38, 38, 38, var(--bs-link-opacity, 1)) !important; color: RGBA(54, 54, 54, var(--bs-link-opacity, 1)) !important;
text-decoration-color: RGBA(38, 38, 38, var(--bs-link-underline-opacity, 1)) !important; text-decoration-color: RGBA(54, 54, 54, var(--bs-link-underline-opacity, 1)) !important;
} }
.link-dark { .link-dark {
@ -6591,8 +6591,8 @@ textarea.form-control-lg {
text-decoration-color: RGBA(var(--bs-dark-rgb), var(--bs-link-underline-opacity, 1)) !important; text-decoration-color: RGBA(var(--bs-dark-rgb), var(--bs-link-underline-opacity, 1)) !important;
} }
.link-dark:hover, .link-dark:focus { .link-dark:hover, .link-dark:focus {
color: RGBA(0, 0, 0, var(--bs-link-opacity, 1)) !important; color: RGBA(201, 201, 201, var(--bs-link-opacity, 1)) !important;
text-decoration-color: RGBA(0, 0, 0, var(--bs-link-underline-opacity, 1)) !important; text-decoration-color: RGBA(201, 201, 201, var(--bs-link-underline-opacity, 1)) !important;
} }
.link-body-emphasis { .link-body-emphasis {
@ -11588,7 +11588,7 @@ textarea.form-control-lg {
.dropdown-item.active, .dropdown-item.active,
.dropdown-item:hover, .dropdown-item:hover,
option:disabled { option:disabled {
color: #222; color: #303030;
} }
.input-group-text { .input-group-text {

78
src/assets/css/themes/vaporwave-dark.css
View file

@ -36,7 +36,7 @@
--bs-warning: #fffb96; --bs-warning: #fffb96;
--bs-danger: rgb(255, 95, 110); --bs-danger: rgb(255, 95, 110);
--bs-light: #444; --bs-light: #444;
--bs-dark: #222; --bs-dark: #ebebeb;
--bs-primary-rgb: 255, 64, 186; --bs-primary-rgb: 255, 64, 186;
--bs-secondary-rgb: 1, 205, 254; --bs-secondary-rgb: 1, 205, 254;
--bs-success-rgb: 5, 255, 161; --bs-success-rgb: 5, 255, 161;
@ -44,7 +44,7 @@
--bs-warning-rgb: 255, 251, 150; --bs-warning-rgb: 255, 251, 150;
--bs-danger-rgb: 255, 95, 110; --bs-danger-rgb: 255, 95, 110;
--bs-light-rgb: 68, 68, 68; --bs-light-rgb: 68, 68, 68;
--bs-dark-rgb: 34, 34, 34; --bs-dark-rgb: 235, 235, 235;
--bs-primary-text-emphasis: #661a4a; --bs-primary-text-emphasis: #661a4a;
--bs-secondary-text-emphasis: #005266; --bs-secondary-text-emphasis: #005266;
--bs-success-text-emphasis: #026640; --bs-success-text-emphasis: #026640;
@ -2029,15 +2029,15 @@ progress {
} }
.table-dark { .table-dark {
--bs-table-color: #fff; --bs-table-color: #000;
--bs-table-bg: #222; --bs-table-bg: #ebebeb;
--bs-table-border-color: #383838; --bs-table-border-color: #d4d4d4;
--bs-table-striped-bg: #2d2d2d; --bs-table-striped-bg: #dfdfdf;
--bs-table-striped-color: #fff; --bs-table-striped-color: #000;
--bs-table-active-bg: #383838; --bs-table-active-bg: #d4d4d4;
--bs-table-active-color: #fff; --bs-table-active-color: #000;
--bs-table-hover-bg: #333333; --bs-table-hover-bg: #d9d9d9;
--bs-table-hover-color: #fff; --bs-table-hover-color: #000;
color: var(--bs-table-color); color: var(--bs-table-color);
border-color: var(--bs-table-border-color); border-color: var(--bs-table-border-color);
} }
@ -3099,20 +3099,20 @@ textarea.form-control-lg {
} }
.btn-dark { .btn-dark {
--bs-btn-color: #fff; --bs-btn-color: #000;
--bs-btn-bg: #222; --bs-btn-bg: #ebebeb;
--bs-btn-border-color: #222; --bs-btn-border-color: #ebebeb;
--bs-btn-hover-color: #fff; --bs-btn-hover-color: #000;
--bs-btn-hover-bg: #434343; --bs-btn-hover-bg: #eeeeee;
--bs-btn-hover-border-color: #383838; --bs-btn-hover-border-color: #ededed;
--bs-btn-focus-shadow-rgb: 67, 67, 67; --bs-btn-focus-shadow-rgb: 200, 200, 200;
--bs-btn-active-color: #fff; --bs-btn-active-color: #000;
--bs-btn-active-bg: #4e4e4e; --bs-btn-active-bg: #efefef;
--bs-btn-active-border-color: #383838; --bs-btn-active-border-color: #ededed;
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
--bs-btn-disabled-color: #fff; --bs-btn-disabled-color: #000;
--bs-btn-disabled-bg: #222; --bs-btn-disabled-bg: #ebebeb;
--bs-btn-disabled-border-color: #222; --bs-btn-disabled-border-color: #ebebeb;
} }
.btn-outline-primary { .btn-outline-primary {
@ -3235,19 +3235,19 @@ textarea.form-control-lg {
} }
.btn-outline-dark { .btn-outline-dark {
--bs-btn-color: #222; --bs-btn-color: #ebebeb;
--bs-btn-border-color: #222; --bs-btn-border-color: #ebebeb;
--bs-btn-hover-color: #fff; --bs-btn-hover-color: #000;
--bs-btn-hover-bg: #222; --bs-btn-hover-bg: #ebebeb;
--bs-btn-hover-border-color: #222; --bs-btn-hover-border-color: #ebebeb;
--bs-btn-focus-shadow-rgb: 34, 34, 34; --bs-btn-focus-shadow-rgb: 235, 235, 235;
--bs-btn-active-color: #fff; --bs-btn-active-color: #000;
--bs-btn-active-bg: #222; --bs-btn-active-bg: #ebebeb;
--bs-btn-active-border-color: #222; --bs-btn-active-border-color: #ebebeb;
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
--bs-btn-disabled-color: #222; --bs-btn-disabled-color: #ebebeb;
--bs-btn-disabled-bg: transparent; --bs-btn-disabled-bg: transparent;
--bs-btn-disabled-border-color: #222; --bs-btn-disabled-border-color: #ebebeb;
--bs-gradient: none; --bs-gradient: none;
} }
@ -6848,8 +6848,8 @@ textarea.form-control-lg {
} }
.text-bg-dark { .text-bg-dark {
color: #fff !important; color: #000 !important;
background-color: RGBA(34, 34, 34, var(--bs-bg-opacity, 1)) !important; background-color: RGBA(235, 235, 235, var(--bs-bg-opacity, 1)) !important;
} }
.link-primary { .link-primary {
@ -6920,8 +6920,8 @@ textarea.form-control-lg {
text-decoration-color: RGBA(var(--bs-dark-rgb), var(--bs-link-underline-opacity, 1)) !important; text-decoration-color: RGBA(var(--bs-dark-rgb), var(--bs-link-underline-opacity, 1)) !important;
} }
.link-dark:hover, .link-dark:focus { .link-dark:hover, .link-dark:focus {
color: RGBA(27, 27, 27, var(--bs-link-opacity, 1)) !important; color: RGBA(239, 239, 239, var(--bs-link-opacity, 1)) !important;
text-decoration-color: RGBA(27, 27, 27, var(--bs-link-underline-opacity, 1)) !important; text-decoration-color: RGBA(239, 239, 239, var(--bs-link-underline-opacity, 1)) !important;
} }
.link-body-emphasis { .link-body-emphasis {

2
src/shared/components/app/footer.tsx
View file

@ -58,7 +58,7 @@ export class Footer extends Component<FooterProps, any> {
</li> </li>
<li className="nav-item"> <li className="nav-item">
<a className="nav-link" href={joinLemmyUrl}> <a className="nav-link" href={joinLemmyUrl}>
{I18NextService.i18n.t("join_lemmy")} {new URL(joinLemmyUrl).hostname}
</a> </a>
</li> </li>
</ul> </ul>

36
src/shared/components/common/data-type-select.tsx
View file

@ -1,3 +1,5 @@
import { randomStr } from "@utils/helpers";
import classNames from "classnames";
import { Component, linkEvent } from "inferno"; import { Component, linkEvent } from "inferno";
import { DataType } from "../../interfaces"; import { DataType } from "../../interfaces";
import { I18NextService } from "../../services"; import { I18NextService } from "../../services";
@ -15,6 +17,8 @@ export class DataTypeSelect extends Component<
DataTypeSelectProps, DataTypeSelectProps,
DataTypeSelectState DataTypeSelectState
> { > {
private id = `listing-type-input-${randomStr()}`;
state: DataTypeSelectState = { state: DataTypeSelectState = {
type_: this.props.type_, type_: this.props.type_,
}; };
@ -31,33 +35,41 @@ export class DataTypeSelect extends Component<
render() { render() {
return ( return (
<div className="data-type-select btn-group btn-group-toggle flex-wrap"> <div
<label className="data-type-select btn-group btn-group-toggle flex-wrap"
className={`pointer btn btn-outline-secondary role="group"
${this.state.type_ == DataType.Post && "active"}
`}
> >
<input <input
id={`${this.id}-posts`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={DataType.Post} value={DataType.Post}
checked={this.state.type_ == DataType.Post} checked={this.state.type_ === DataType.Post}
onChange={linkEvent(this, this.handleTypeChange)} onChange={linkEvent(this, this.handleTypeChange)}
/> />
<label
htmlFor={`${this.id}-posts`}
className={classNames("pointer btn btn-outline-secondary", {
active: this.state.type_ === DataType.Post,
})}
>
{I18NextService.i18n.t("posts")} {I18NextService.i18n.t("posts")}
</label> </label>
<label
className={`pointer btn btn-outline-secondary ${
this.state.type_ == DataType.Comment && "active"
}`}
>
<input <input
id={`${this.id}-comments`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={DataType.Comment} value={DataType.Comment}
checked={this.state.type_ == DataType.Comment} checked={this.state.type_ === DataType.Comment}
onChange={linkEvent(this, this.handleTypeChange)} onChange={linkEvent(this, this.handleTypeChange)}
/> />
<label
htmlFor={`${this.id}-comments`}
className={classNames("pointer btn btn-outline-secondary", {
active: this.state.type_ === DataType.Comment,
})}
>
{I18NextService.i18n.t("comments")} {I18NextService.i18n.t("comments")}
</label> </label>
</div> </div>

61
src/shared/components/common/listing-type-select.tsx
View file

@ -1,4 +1,5 @@
import { randomStr } from "@utils/helpers"; import { randomStr } from "@utils/helpers";
import classNames from "classnames";
import { Component, linkEvent } from "inferno"; import { Component, linkEvent } from "inferno";
import { ListingType } from "lemmy-js-client"; import { ListingType } from "lemmy-js-client";
import { I18NextService, UserService } from "../../services"; import { I18NextService, UserService } from "../../services";
@ -38,60 +39,72 @@ export class ListingTypeSelect extends Component<
render() { render() {
return ( return (
<div className="listing-type-select btn-group btn-group-toggle flex-wrap"> <div
{this.props.showSubscribed && ( className="listing-type-select btn-group btn-group-toggle flex-wrap"
<label role="group"
title={I18NextService.i18n.t("subscribed_description")}
className={`btn btn-outline-secondary
${this.state.type_ == "Subscribed" && "active"}
${!UserService.Instance.myUserInfo ? "disabled" : "pointer"}
`}
> >
{this.props.showSubscribed && (
<>
<input <input
id={`${this.id}-subscribed`} id={`${this.id}-subscribed`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={"Subscribed"} value={"Subscribed"}
checked={this.state.type_ == "Subscribed"} checked={this.state.type_ === "Subscribed"}
onChange={linkEvent(this, this.handleTypeChange)} onChange={linkEvent(this, this.handleTypeChange)}
disabled={!UserService.Instance.myUserInfo} disabled={!UserService.Instance.myUserInfo}
/> />
<label
htmlFor={`${this.id}-subscribed`}
title={I18NextService.i18n.t("subscribed_description")}
className={classNames("btn btn-outline-secondary", {
active: this.state.type_ === "Subscribed",
disabled: !UserService.Instance.myUserInfo,
pointer: UserService.Instance.myUserInfo,
})}
>
{I18NextService.i18n.t("subscribed")} {I18NextService.i18n.t("subscribed")}
</label> </label>
</>
)} )}
{this.props.showLocal && ( {this.props.showLocal && (
<label <>
title={I18NextService.i18n.t("local_description")}
className={`pointer btn btn-outline-secondary ${
this.state.type_ == "Local" && "active"
}`}
>
<input <input
id={`${this.id}-local`} id={`${this.id}-local`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={"Local"} value={"Local"}
checked={this.state.type_ == "Local"} checked={this.state.type_ === "Local"}
onChange={linkEvent(this, this.handleTypeChange)} onChange={linkEvent(this, this.handleTypeChange)}
/> />
<label
htmlFor={`${this.id}-local`}
title={I18NextService.i18n.t("local_description")}
className={classNames("pointer btn btn-outline-secondary", {
active: this.state.type_ === "Local",
})}
>
{I18NextService.i18n.t("local")} {I18NextService.i18n.t("local")}
</label> </label>
</>
)} )}
<label
title={I18NextService.i18n.t("all_description")}
className={`pointer btn btn-outline-secondary ${
(this.state.type_ == "All" && "active") ||
(!this.props.showLocal && this.state.type_ == "Local" && "active")
}`}
>
<input <input
id={`${this.id}-all`} id={`${this.id}-all`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={"All"} value={"All"}
checked={this.state.type_ == "All"} checked={this.state.type_ === "All"}
onChange={linkEvent(this, this.handleTypeChange)} onChange={linkEvent(this, this.handleTypeChange)}
/> />
<label
title={I18NextService.i18n.t("all_description")}
htmlFor={`${this.id}-all`}
className={classNames("pointer btn btn-outline-secondary", {
active:
this.state.type_ === "All" ||
(!this.props.showLocal && this.state.type_) === "Local",
})}
>
{I18NextService.i18n.t("all")} {I18NextService.i18n.t("all")}
</label> </label>
</div> </div>

2
src/shared/components/common/markdown-textarea.tsx
View file

@ -219,7 +219,7 @@ export class MarkdownTextArea extends Component<
{this.getFormatButton("spoiler", this.handleInsertSpoiler)} {this.getFormatButton("spoiler", this.handleInsertSpoiler)}
<a <a
href={markdownHelpUrl} href={markdownHelpUrl}
className="btn btn-sm text-muted fw-bold" className="btn btn-sm btn-link rounded-0 text-muted fw-bold"
title={I18NextService.i18n.t("formatting_help")} title={I18NextService.i18n.t("formatting_help")}
rel={relTags} rel={relTags}
> >

9
src/shared/components/common/sort-select.tsx
View file

@ -79,6 +79,15 @@ export class SortSelect extends Component<SortSelectProps, SortSelectState> {
<option value={"TopMonth"}> <option value={"TopMonth"}>
{I18NextService.i18n.t("top_month")} {I18NextService.i18n.t("top_month")}
</option> </option>
<option value={"TopThreeMonths"}>
{I18NextService.i18n.t("top_three_months")}
</option>
<option value={"TopSixMonths"}>
{I18NextService.i18n.t("top_six_months")}
</option>
<option value={"TopNineMonths"}>
{I18NextService.i18n.t("top_nine_months")}
</option>
<option value={"TopYear"}>{I18NextService.i18n.t("top_year")}</option> <option value={"TopYear"}>{I18NextService.i18n.t("top_year")}</option>
<option value={"TopAll"}>{I18NextService.i18n.t("top_all")}</option> <option value={"TopAll"}>{I18NextService.i18n.t("top_all")}</option>
</select> </select>

10
src/shared/components/home/site-sidebar.tsx
View file

@ -1,3 +1,4 @@
import classNames from "classnames";
import { Component, linkEvent } from "inferno"; import { Component, linkEvent } from "inferno";
import { PersonView, Site, SiteAggregates } from "lemmy-js-client"; import { PersonView, Site, SiteAggregates } from "lemmy-js-client";
import { mdToHtml } from "../../markdown"; import { mdToHtml } from "../../markdown";
@ -32,10 +33,7 @@ export class SiteSidebar extends Component<SiteSidebarProps, SiteSidebarState> {
return ( return (
<div className="site-sidebar accordion"> <div className="site-sidebar accordion">
<section id="sidebarInfo" className="card border-secondary mb-3"> <section id="sidebarInfo" className="card border-secondary mb-3">
<header <header className="card-header" id="sidebarInfoHeader">
className="card-header d-flex align-items-center"
id="sidebarInfoHeader"
>
{this.siteName()} {this.siteName()}
{!this.state.collapsed && ( {!this.state.collapsed && (
<BannerIconHeader banner={this.props.site.banner} /> <BannerIconHeader banner={this.props.site.banner} />
@ -54,7 +52,7 @@ export class SiteSidebar extends Component<SiteSidebarProps, SiteSidebarState> {
siteName() { siteName() {
return ( return (
<> <div className={classNames({ "mb-2": !this.state.collapsed })}>
<h5 className="mb-0 d-inline">{this.props.site.name}</h5> <h5 className="mb-0 d-inline">{this.props.site.name}</h5>
{!this.props.isMobile && ( {!this.props.isMobile && (
<button <button
@ -83,7 +81,7 @@ export class SiteSidebar extends Component<SiteSidebarProps, SiteSidebarState> {
)} )}
</button> </button>
)} )}
</> </div>
); );
} }

99
src/shared/components/person/inbox.tsx
View file

@ -11,8 +11,9 @@ import {
setIsoData, setIsoData,
updatePersonBlock, updatePersonBlock,
} from "@utils/app"; } from "@utils/app";
import { capitalizeFirstLetter } from "@utils/helpers"; import { capitalizeFirstLetter, randomStr } from "@utils/helpers";
import { RouteDataResponse } from "@utils/types"; import { RouteDataResponse } from "@utils/types";
import classNames from "classnames";
import { Component, linkEvent } from "inferno"; import { Component, linkEvent } from "inferno";
import { import {
AddAdmin, AddAdmin,
@ -283,34 +284,41 @@ export class Inbox extends Component<any, InboxState> {
} }
unreadOrAllRadios() { unreadOrAllRadios() {
const radioId = randomStr();
return ( return (
<div className="btn-group btn-group-toggle flex-wrap"> <div className="btn-group btn-group-toggle flex-wrap" role="group">
<label
className={`btn btn-outline-secondary pointer
${this.state.unreadOrAll == UnreadOrAll.Unread && "active"}
`}
>
<input <input
id={`${radioId}-unread`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={UnreadOrAll.Unread} value={UnreadOrAll.Unread}
checked={this.state.unreadOrAll == UnreadOrAll.Unread} checked={this.state.unreadOrAll === UnreadOrAll.Unread}
onChange={linkEvent(this, this.handleUnreadOrAllChange)} onChange={linkEvent(this, this.handleUnreadOrAllChange)}
/> />
<label
htmlFor={`${radioId}-unread`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.unreadOrAll === UnreadOrAll.Unread,
})}
>
{I18NextService.i18n.t("unread")} {I18NextService.i18n.t("unread")}
</label> </label>
<label
className={`btn btn-outline-secondary pointer
${this.state.unreadOrAll == UnreadOrAll.All && "active"}
`}
>
<input <input
id={`${radioId}-all`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={UnreadOrAll.All} value={UnreadOrAll.All}
checked={this.state.unreadOrAll == UnreadOrAll.All} checked={this.state.unreadOrAll === UnreadOrAll.All}
onChange={linkEvent(this, this.handleUnreadOrAllChange)} onChange={linkEvent(this, this.handleUnreadOrAllChange)}
/> />
<label
htmlFor={`${radioId}-all`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.unreadOrAll === UnreadOrAll.All,
})}
>
{I18NextService.i18n.t("all")} {I18NextService.i18n.t("all")}
</label> </label>
</div> </div>
@ -318,62 +326,75 @@ export class Inbox extends Component<any, InboxState> {
} }
messageTypeRadios() { messageTypeRadios() {
const radioId = randomStr();
return ( return (
<div className="btn-group btn-group-toggle flex-wrap"> <div className="btn-group btn-group-toggle flex-wrap" role="group">
<label
className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.All && "active"}
`}
>
<input <input
id={`${radioId}-all`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={MessageType.All} value={MessageType.All}
checked={this.state.messageType == MessageType.All} checked={this.state.messageType === MessageType.All}
onChange={linkEvent(this, this.handleMessageTypeChange)} onChange={linkEvent(this, this.handleMessageTypeChange)}
/> />
<label
htmlFor={`${radioId}-all`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.messageType === MessageType.All,
})}
>
{I18NextService.i18n.t("all")} {I18NextService.i18n.t("all")}
</label> </label>
<label
className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.Replies && "active"}
`}
>
<input <input
id={`${radioId}-replies`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={MessageType.Replies} value={MessageType.Replies}
checked={this.state.messageType == MessageType.Replies} checked={this.state.messageType === MessageType.Replies}
onChange={linkEvent(this, this.handleMessageTypeChange)} onChange={linkEvent(this, this.handleMessageTypeChange)}
/> />
<label
htmlFor={`${radioId}-replies`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.messageType === MessageType.Replies,
})}
>
{I18NextService.i18n.t("replies")} {I18NextService.i18n.t("replies")}
</label> </label>
<label
className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.Mentions && "active"}
`}
>
<input <input
id={`${radioId}-mentions`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={MessageType.Mentions} value={MessageType.Mentions}
checked={this.state.messageType == MessageType.Mentions} checked={this.state.messageType === MessageType.Mentions}
onChange={linkEvent(this, this.handleMessageTypeChange)} onChange={linkEvent(this, this.handleMessageTypeChange)}
/> />
<label
htmlFor={`${radioId}-mentions`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.messageType === MessageType.Mentions,
})}
>
{I18NextService.i18n.t("mentions")} {I18NextService.i18n.t("mentions")}
</label> </label>
<label
className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.Messages && "active"}
`}
>
<input <input
id={`${radioId}-messages`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={MessageType.Messages} value={MessageType.Messages}
checked={this.state.messageType == MessageType.Messages} checked={this.state.messageType === MessageType.Messages}
onChange={linkEvent(this, this.handleMessageTypeChange)} onChange={linkEvent(this, this.handleMessageTypeChange)}
/> />
<label
htmlFor={`${radioId}-messages`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.messageType === MessageType.Messages,
})}
>
{I18NextService.i18n.t("messages")} {I18NextService.i18n.t("messages")}
</label> </label>
</div> </div>

18
src/shared/components/person/profile.tsx
View file

@ -18,6 +18,7 @@ import {
getQueryParams, getQueryParams,
getQueryString, getQueryString,
numToSI, numToSI,
randomStr,
} from "@utils/helpers"; } from "@utils/helpers";
import { canMod, isAdmin, isBanned } from "@utils/roles"; import { canMod, isAdmin, isBanned } from "@utils/roles";
import type { QueryParams } from "@utils/types"; import type { QueryParams } from "@utils/types";
@ -397,7 +398,7 @@ export class Profile extends Component<
get viewRadios() { get viewRadios() {
return ( return (
<div className="btn-group btn-group-toggle flex-wrap mb-2"> <div className="btn-group btn-group-toggle flex-wrap mb-2" role="group">
{this.getRadio(PersonDetailsView.Overview)} {this.getRadio(PersonDetailsView.Overview)}
{this.getRadio(PersonDetailsView.Comments)} {this.getRadio(PersonDetailsView.Comments)}
{this.getRadio(PersonDetailsView.Posts)} {this.getRadio(PersonDetailsView.Posts)}
@ -409,22 +410,27 @@ export class Profile extends Component<
getRadio(view: PersonDetailsView) { getRadio(view: PersonDetailsView) {
const { view: urlView } = getProfileQueryParams(); const { view: urlView } = getProfileQueryParams();
const active = view === urlView; const active = view === urlView;
const radioId = randomStr();
return ( return (
<label <>
className={classNames("btn btn-outline-secondary pointer", {
active,
})}
>
<input <input
id={radioId}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={view} value={view}
checked={active} checked={active}
onChange={linkEvent(this, this.handleViewChange)} onChange={linkEvent(this, this.handleViewChange)}
/> />
<label
htmlFor={radioId}
className={classNames("btn btn-outline-secondary pointer", {
active,
})}
>
{I18NextService.i18n.t(view.toLowerCase() as NoOptionI18nKeys)} {I18NextService.i18n.t(view.toLowerCase() as NoOptionI18nKeys)}
</label> </label>
</>
); );
} }

35
src/shared/components/person/registration-applications.tsx
View file

@ -3,7 +3,9 @@ import {
myAuthRequired, myAuthRequired,
setIsoData, setIsoData,
} from "@utils/app"; } from "@utils/app";
import { randomStr } from "@utils/helpers";
import { RouteDataResponse } from "@utils/types"; import { RouteDataResponse } from "@utils/types";
import classNames from "classnames";
import { Component, linkEvent } from "inferno"; import { Component, linkEvent } from "inferno";
import { import {
ApproveRegistrationApplication, ApproveRegistrationApplication,
@ -125,34 +127,41 @@ export class RegistrationApplications extends Component<
} }
unreadOrAllRadios() { unreadOrAllRadios() {
const radioId = randomStr();
return ( return (
<div className="btn-group btn-group-toggle flex-wrap mb-2"> <div className="btn-group btn-group-toggle flex-wrap mb-2" role="group">
<label
className={`btn btn-outline-secondary pointer
${this.state.unreadOrAll == UnreadOrAll.Unread && "active"}
`}
>
<input <input
id={`${radioId}-unread`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={UnreadOrAll.Unread} value={UnreadOrAll.Unread}
checked={this.state.unreadOrAll == UnreadOrAll.Unread} checked={this.state.unreadOrAll === UnreadOrAll.Unread}
onChange={linkEvent(this, this.handleUnreadOrAllChange)} onChange={linkEvent(this, this.handleUnreadOrAllChange)}
/> />
<label
htmlFor={`${radioId}-unread`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.unreadOrAll === UnreadOrAll.Unread,
})}
>
{I18NextService.i18n.t("unread")} {I18NextService.i18n.t("unread")}
</label> </label>
<label
className={`btn btn-outline-secondary pointer
${this.state.unreadOrAll == UnreadOrAll.All && "active"}
`}
>
<input <input
id={`${radioId}-all`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={UnreadOrAll.All} value={UnreadOrAll.All}
checked={this.state.unreadOrAll == UnreadOrAll.All} checked={this.state.unreadOrAll === UnreadOrAll.All}
onChange={linkEvent(this, this.handleUnreadOrAllChange)} onChange={linkEvent(this, this.handleUnreadOrAllChange)}
/> />
<label
htmlFor={`${radioId}-all`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.unreadOrAll === UnreadOrAll.All,
})}
>
{I18NextService.i18n.t("all")} {I18NextService.i18n.t("all")}
</label> </label>
</div> </div>

104
src/shared/components/person/reports.tsx
View file

@ -5,8 +5,10 @@ import {
myAuthRequired, myAuthRequired,
setIsoData, setIsoData,
} from "@utils/app"; } from "@utils/app";
import { randomStr } from "@utils/helpers";
import { amAdmin } from "@utils/roles"; import { amAdmin } from "@utils/roles";
import { RouteDataResponse } from "@utils/types"; import { RouteDataResponse } from "@utils/types";
import classNames from "classnames";
import { Component, linkEvent } from "inferno"; import { Component, linkEvent } from "inferno";
import { import {
CommentReportResponse, CommentReportResponse,
@ -187,34 +189,41 @@ export class Reports extends Component<any, ReportsState> {
} }
unreadOrAllRadios() { unreadOrAllRadios() {
const radioId = randomStr();
return ( return (
<div className="btn-group btn-group-toggle flex-wrap mb-2"> <div className="btn-group btn-group-toggle flex-wrap mb-2" role="group">
<label
className={`btn btn-outline-secondary pointer
${this.state.unreadOrAll == UnreadOrAll.Unread && "active"}
`}
>
<input <input
id={`${radioId}-unread`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={UnreadOrAll.Unread} value={UnreadOrAll.Unread}
checked={this.state.unreadOrAll == UnreadOrAll.Unread} checked={this.state.unreadOrAll === UnreadOrAll.Unread}
onChange={linkEvent(this, this.handleUnreadOrAllChange)} onChange={linkEvent(this, this.handleUnreadOrAllChange)}
/> />
<label
htmlFor={`${radioId}-unread`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.unreadOrAll === UnreadOrAll.Unread,
})}
>
{I18NextService.i18n.t("unread")} {I18NextService.i18n.t("unread")}
</label> </label>
<label
className={`btn btn-outline-secondary pointer
${this.state.unreadOrAll == UnreadOrAll.All && "active"}
`}
>
<input <input
id={`${radioId}-all`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={UnreadOrAll.All} value={UnreadOrAll.All}
checked={this.state.unreadOrAll == UnreadOrAll.All} checked={this.state.unreadOrAll === UnreadOrAll.All}
onChange={linkEvent(this, this.handleUnreadOrAllChange)} onChange={linkEvent(this, this.handleUnreadOrAllChange)}
/> />
<label
htmlFor={`${radioId}-all`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.unreadOrAll === UnreadOrAll.All,
})}
>
{I18NextService.i18n.t("all")} {I18NextService.i18n.t("all")}
</label> </label>
</div> </div>
@ -222,70 +231,83 @@ export class Reports extends Component<any, ReportsState> {
} }
messageTypeRadios() { messageTypeRadios() {
const radioId = randomStr();
return ( return (
<div className="btn-group btn-group-toggle flex-wrap mb-2"> <div className="btn-group btn-group-toggle flex-wrap mb-2" role="group">
<label
className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.All && "active"}
`}
>
<input <input
id={`${radioId}-all`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={MessageType.All} value={MessageType.All}
checked={this.state.messageType == MessageType.All} checked={this.state.messageType === MessageType.All}
onChange={linkEvent(this, this.handleMessageTypeChange)} onChange={linkEvent(this, this.handleMessageTypeChange)}
/> />
<label
htmlFor={`${radioId}-all`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.messageType === MessageType.All,
})}
>
{I18NextService.i18n.t("all")} {I18NextService.i18n.t("all")}
</label> </label>
<label
className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.CommentReport && "active"}
`}
>
<input <input
id={`${radioId}-comments`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={MessageType.CommentReport} value={MessageType.CommentReport}
checked={this.state.messageType == MessageType.CommentReport} checked={this.state.messageType === MessageType.CommentReport}
onChange={linkEvent(this, this.handleMessageTypeChange)} onChange={linkEvent(this, this.handleMessageTypeChange)}
/> />
<label
htmlFor={`${radioId}-comments`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.messageType === MessageType.CommentReport,
})}
>
{I18NextService.i18n.t("comments")} {I18NextService.i18n.t("comments")}
</label> </label>
<label
className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.PostReport && "active"}
`}
>
<input <input
id={`${radioId}-posts`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={MessageType.PostReport} value={MessageType.PostReport}
checked={this.state.messageType == MessageType.PostReport} checked={this.state.messageType === MessageType.PostReport}
onChange={linkEvent(this, this.handleMessageTypeChange)} onChange={linkEvent(this, this.handleMessageTypeChange)}
/> />
<label
htmlFor={`${radioId}-posts`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.messageType === MessageType.PostReport,
})}
>
{I18NextService.i18n.t("posts")} {I18NextService.i18n.t("posts")}
</label> </label>
{amAdmin() && ( {amAdmin() && (
<label <>
className={`btn btn-outline-secondary pointer
${
this.state.messageType == MessageType.PrivateMessageReport &&
"active"
}
`}
>
<input <input
id={`${radioId}-messages`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={MessageType.PrivateMessageReport} value={MessageType.PrivateMessageReport}
checked={ checked={
this.state.messageType == MessageType.PrivateMessageReport this.state.messageType === MessageType.PrivateMessageReport
} }
onChange={linkEvent(this, this.handleMessageTypeChange)} onChange={linkEvent(this, this.handleMessageTypeChange)}
/> />
<label
htmlFor={`${radioId}-messages`}
className={classNames("btn btn-outline-secondary pointer", {
active:
this.state.messageType === MessageType.PrivateMessageReport,
})}
>
{I18NextService.i18n.t("messages")} {I18NextService.i18n.t("messages")}
</label> </label>
</>
)} )}
</div> </div>
); );

16
src/shared/components/post/post-listing.tsx
View file

@ -602,7 +602,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
{this.commentsButton} {this.commentsButton}
{canShare() && ( {canShare() && (
<button <button
className="btn btn-sm btn-animate text-muted py-0" className="btn btn-sm btn-link btn-animate text-muted py-0"
onClick={linkEvent(this, this.handleShare)} onClick={linkEvent(this, this.handleShare)}
type="button" type="button"
> >
@ -611,7 +611,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
)} )}
{!post.local && ( {!post.local && (
<a <a
className="btn btn-sm btn-animate text-muted py-0" className="btn btn-sm btn-link btn-animate text-muted py-0"
title={I18NextService.i18n.t("link")} title={I18NextService.i18n.t("link")}
href={post.ap_id} href={post.ap_id}
> >
@ -650,7 +650,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
<div className="dropdown"> <div className="dropdown">
<button <button
className="btn btn-sm btn-animate text-muted py-0 dropdown-toggle" className="btn btn-sm btn-link btn-animate text-muted py-0 dropdown-toggle"
onClick={linkEvent(this, this.handleShowAdvanced)} onClick={linkEvent(this, this.handleShowAdvanced)}
data-tippy-content={I18NextService.i18n.t("more")} data-tippy-content={I18NextService.i18n.t("more")}
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
@ -783,7 +783,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
: I18NextService.i18n.t("save"); : I18NextService.i18n.t("save");
return ( return (
<button <button
className="btn btn-sm btn-animate text-muted py-0" className="btn btn-sm btn-link btn-animate text-muted py-0"
onClick={linkEvent(this, this.handleSavePostClick)} onClick={linkEvent(this, this.handleSavePostClick)}
data-tippy-content={label} data-tippy-content={label}
aria-label={label} aria-label={label}
@ -804,7 +804,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
get crossPostButton() { get crossPostButton() {
return ( return (
<Link <Link
className="btn btn-sm btn-animate text-muted py-0" className="btn btn-sm btn-link btn-animate text-muted py-0"
to={{ to={{
/* Empty string properties are required to satisfy type*/ /* Empty string properties are required to satisfy type*/
pathname: "/create_post", pathname: "/create_post",
@ -894,7 +894,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
get viewSourceButton() { get viewSourceButton() {
return ( return (
<button <button
className="btn btn-sm btn-animate text-muted py-0" className="btn btn-sm btn-link btn-animate text-muted py-0"
onClick={linkEvent(this, this.handleViewSource)} onClick={linkEvent(this, this.handleViewSource)}
data-tippy-content={I18NextService.i18n.t("view_source")} data-tippy-content={I18NextService.i18n.t("view_source")}
aria-label={I18NextService.i18n.t("view_source")} aria-label={I18NextService.i18n.t("view_source")}
@ -1327,10 +1327,10 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
const post = this.postView.post; const post = this.postView.post;
return post.thumbnail_url || (post.url && isImage(post.url)) ? ( return post.thumbnail_url || (post.url && isImage(post.url)) ? (
<div className="row"> <div className="row">
<div className={`${this.state.imageExpanded ? "col-12" : "col-8"}`}> <div className={`${this.state.imageExpanded ? "col-12" : "col-9"}`}>
{this.postTitleLine()} {this.postTitleLine()}
</div> </div>
<div className="col-4"> <div className="col-3 mobile-thumbnail-container">
{/* Post thumbnail */} {/* Post thumbnail */}
{!this.state.imageExpanded && this.thumbnail()} {!this.state.imageExpanded && this.thumbnail()}
</div> </div>

77
src/shared/components/post/post.tsx
View file

@ -19,10 +19,11 @@ import {
restoreScrollPosition, restoreScrollPosition,
saveScrollPosition, saveScrollPosition,
} from "@utils/browser"; } from "@utils/browser";
import { debounce } from "@utils/helpers"; import { debounce, randomStr } from "@utils/helpers";
import { isImage } from "@utils/media"; import { isImage } from "@utils/media";
import { RouteDataResponse } from "@utils/types"; import { RouteDataResponse } from "@utils/types";
import autosize from "autosize"; import autosize from "autosize";
import classNames from "classnames";
import { Component, RefObject, createRef, linkEvent } from "inferno"; import { Component, RefObject, createRef, linkEvent } from "inferno";
import { import {
AddAdmin, AddAdmin,
@ -430,80 +431,98 @@ export class Post extends Component<any, PostState> {
} }
sortRadios() { sortRadios() {
const radioId =
this.state.postRes.state === "success"
? this.state.postRes.data.post_view.post.id
: randomStr();
return ( return (
<> <>
<div className="btn-group btn-group-toggle flex-wrap me-3 mb-2"> <div
<label className="btn-group btn-group-toggle flex-wrap me-3 mb-2"
className={`btn btn-outline-secondary pointer ${ role="group"
this.state.commentSort === "Hot" && "active"
}`}
> >
{I18NextService.i18n.t("hot")}
<input <input
id={`${radioId}-hot`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={"Hot"} value={"Hot"}
checked={this.state.commentSort === "Hot"} checked={this.state.commentSort === "Hot"}
onChange={linkEvent(this, this.handleCommentSortChange)} onChange={linkEvent(this, this.handleCommentSortChange)}
/> />
</label>
<label <label
className={`btn btn-outline-secondary pointer ${ htmlFor={`${radioId}-hot`}
this.state.commentSort === "Top" && "active" className={classNames("btn btn-outline-secondary pointer", {
}`} active: this.state.commentSort === "Hot",
})}
> >
{I18NextService.i18n.t("top")} {I18NextService.i18n.t("hot")}
</label>
<input <input
id={`${radioId}-top`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={"Top"} value={"Top"}
checked={this.state.commentSort === "Top"} checked={this.state.commentSort === "Top"}
onChange={linkEvent(this, this.handleCommentSortChange)} onChange={linkEvent(this, this.handleCommentSortChange)}
/> />
</label>
<label <label
className={`btn btn-outline-secondary pointer ${ htmlFor={`${radioId}-top`}
this.state.commentSort === "New" && "active" className={classNames("btn btn-outline-secondary pointer", {
}`} active: this.state.commentSort === "Top",
})}
> >
{I18NextService.i18n.t("new")} {I18NextService.i18n.t("top")}
</label>
<input <input
id={`${radioId}-new`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={"New"} value={"New"}
checked={this.state.commentSort === "New"} checked={this.state.commentSort === "New"}
onChange={linkEvent(this, this.handleCommentSortChange)} onChange={linkEvent(this, this.handleCommentSortChange)}
/> />
</label>
<label <label
className={`btn btn-outline-secondary pointer ${ htmlFor={`${radioId}-new`}
this.state.commentSort === "Old" && "active" className={classNames("btn btn-outline-secondary pointer", {
}`} active: this.state.commentSort === "New",
})}
> >
{I18NextService.i18n.t("old")} {I18NextService.i18n.t("new")}
</label>
<input <input
id={`${radioId}-old`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={"Old"} value={"Old"}
checked={this.state.commentSort === "Old"} checked={this.state.commentSort === "Old"}
onChange={linkEvent(this, this.handleCommentSortChange)} onChange={linkEvent(this, this.handleCommentSortChange)}
/> />
<label
htmlFor={`${radioId}-old`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.commentSort === "Old",
})}
>
{I18NextService.i18n.t("old")}
</label> </label>
</div> </div>
<div className="btn-group btn-group-toggle flex-wrap mb-2"> <div className="btn-group btn-group-toggle flex-wrap mb-2" role="group">
<label
className={`btn btn-outline-secondary pointer ${
this.state.commentViewType === CommentViewType.Flat && "active"
}`}
>
{I18NextService.i18n.t("chat")}
<input <input
id={`${radioId}-chat`}
type="radio" type="radio"
className="btn-check" className="btn-check"
value={CommentViewType.Flat} value={CommentViewType.Flat}
checked={this.state.commentViewType === CommentViewType.Flat} checked={this.state.commentViewType === CommentViewType.Flat}
onChange={linkEvent(this, this.handleCommentViewTypeChange)} onChange={linkEvent(this, this.handleCommentViewTypeChange)}
/> />
<label
htmlFor={`${radioId}-chat`}
className={classNames("btn btn-outline-secondary pointer", {
active: this.state.commentViewType === CommentViewType.Flat,
})}
>
{I18NextService.i18n.t("chat")}
</label> </label>
</div> </div>
</> </>

2
src/shared/markdown.ts
View file

@ -10,6 +10,7 @@ import markdown_it_container from "markdown-it-container";
// import markdown_it_emoji from "markdown-it-emoji/bare"; // import markdown_it_emoji from "markdown-it-emoji/bare";
import markdown_it_footnote from "markdown-it-footnote"; import markdown_it_footnote from "markdown-it-footnote";
import markdown_it_html5_embed from "markdown-it-html5-embed"; import markdown_it_html5_embed from "markdown-it-html5-embed";
import markdown_it_ruby from "markdown-it-ruby";
import markdown_it_sub from "markdown-it-sub"; import markdown_it_sub from "markdown-it-sub";
import markdown_it_sup from "markdown-it-sup"; import markdown_it_sup from "markdown-it-sup";
import Renderer from "markdown-it/lib/renderer"; import Renderer from "markdown-it/lib/renderer";
@ -159,6 +160,7 @@ export function setupMarkdown() {
.use(markdown_it_footnote) .use(markdown_it_footnote)
.use(markdown_it_html5_embed, html5EmbedConfig) .use(markdown_it_html5_embed, html5EmbedConfig)
.use(markdown_it_container, "spoiler", spoilerConfig) .use(markdown_it_container, "spoiler", spoilerConfig)
.use(markdown_it_ruby)
.use(localInstanceLinkParser); .use(localInstanceLinkParser);
// .use(markdown_it_emoji, { // .use(markdown_it_emoji, {
// defs: emojiDefs, // defs: emojiDefs,

3
src/shared/utils/app/convert-comment-sort-type.ts
View file

@ -11,6 +11,9 @@ export default function convertCommentSortType(
case "TopDay": case "TopDay":
case "TopWeek": case "TopWeek":
case "TopMonth": case "TopMonth":
case "TopThreeMonths":
case "TopSixMonths":
case "TopNineMonths":
case "TopYear": { case "TopYear": {
return "Top"; return "Top";
} }

51
yarn.lock
View file

@ -3026,7 +3026,7 @@ debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
dependencies: dependencies:
ms "2.1.2" ms "2.1.2"
debuglog@*, debuglog@^1.0.1: debuglog@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz" resolved "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw== integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
@ -4759,7 +4759,7 @@ import-sort@^6.0.0:
is-builtin-module "^3.0.0" is-builtin-module "^3.0.0"
resolve "^1.8.1" resolve "^1.8.1"
imurmurhash@*, imurmurhash@^0.1.4: imurmurhash@^0.1.4:
version "0.1.4" version "0.1.4"
resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
@ -5497,10 +5497,10 @@ leac@^0.6.0:
resolved "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz" resolved "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz"
integrity sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg== integrity sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==
lemmy-js-client@0.18.0-rc.2: lemmy-js-client@0.18.1:
version "0.18.0-rc.2" version "0.18.1"
resolved "https://registry.npmjs.org/lemmy-js-client/-/lemmy-js-client-0.18.0-rc.2.tgz" resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.18.1.tgz#28df266eded0ef4a72b05ee6eabebddadfd81a27"
integrity sha512-bnYs89MjlQHwVIr1YIoAvgFkCTWrXDjSgPbCJx8ijrxZXqOKW/KAgWEisfqyFpy3dYpA3/sxFjh7b4sdxM+8VA== integrity sha512-maafUZ9ZJkXthRZmM0+limJmymF2kmN/8SiKufS3V4OVNM72s+wUFFiyhKmA370g23iZRW6SUagE7jNKnqNyYQ==
dependencies: dependencies:
cross-fetch "^3.1.5" cross-fetch "^3.1.5"
form-data "^4.0.0" form-data "^4.0.0"
@ -5646,11 +5646,6 @@ lockfile@^1.0.4:
dependencies: dependencies:
signal-exit "^3.0.2" signal-exit "^3.0.2"
lodash._baseindexof@*:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
integrity sha512-bSYo8Pc/f0qAkr8fPJydpJjtrHiSynYfYBjtANIgXv5xEf1WlTC63dIDlgu0s9dmTvzRu1+JJTxcIAHe+sH0FQ==
lodash._baseuniq@~4.6.0: lodash._baseuniq@~4.6.0:
version "4.6.0" version "4.6.0"
resolved "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz" resolved "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"
@ -5659,33 +5654,11 @@ lodash._baseuniq@~4.6.0:
lodash._createset "~4.0.0" lodash._createset "~4.0.0"
lodash._root "~3.0.0" lodash._root "~3.0.0"
lodash._bindcallback@*:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
integrity sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==
lodash._cacheindexof@*:
version "3.0.2"
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
integrity sha512-S8dUjWr7SUT/X6TBIQ/OYoCHo1Stu1ZRy6uMUSKqzFnZp5G5RyQizSm6kvxD2Ewyy6AVfMg4AToeZzKfF99T5w==
lodash._createcache@*:
version "3.1.2"
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
integrity sha512-ev5SP+iFpZOugyab/DEUQxUeZP5qyciVTlgQ1f4Vlw7VUcCD8fVnyIqVUEIaoFH9zjAqdgi69KiofzvVmda/ZQ==
dependencies:
lodash._getnative "^3.0.0"
lodash._createset@~4.0.0: lodash._createset@~4.0.0:
version "4.0.3" version "4.0.3"
resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
integrity sha512-GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA== integrity sha512-GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA==
lodash._getnative@*, lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
integrity sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==
lodash._root@~3.0.0: lodash._root@~3.0.0:
version "3.0.1" version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
@ -5711,11 +5684,6 @@ lodash.merge@^4.6.2:
resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
lodash.restparam@*:
version "3.6.1"
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
integrity sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==
lodash.sortby@^4.7.0: lodash.sortby@^4.7.0:
version "4.7.0" version "4.7.0"
resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz" resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"
@ -5890,6 +5858,11 @@ markdown-it-html5-embed@^1.0.0:
markdown-it "^8.4.0" markdown-it "^8.4.0"
mimoza "~1.0.0" mimoza "~1.0.0"
markdown-it-ruby@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/markdown-it-ruby/-/markdown-it-ruby-0.1.1.tgz#6e2050a9b2c3275afc2844920d53cdffbbe12f78"
integrity sha512-ct8t/Drt7scv20VdaQtOhpBOC2SDICaW8E/WQS8kY2eUdu0eoDwW8ugXcCy8Vku4Y5CuA5qrewlHpwaFsJxbpQ==
markdown-it-sub@^1.0.0: markdown-it-sub@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.npmjs.org/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz" resolved "https://registry.npmjs.org/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz"
@ -7477,7 +7450,7 @@ readable-stream@~1.1.10:
isarray "0.0.1" isarray "0.0.1"
string_decoder "~0.10.x" string_decoder "~0.10.x"
readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0: readdir-scoped-modules@^1.0.0:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw== integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==