From: Alec Armbruster <35377827+alectrocute@users.noreply.github.com>
Date: Thu, 22 Jun 2023 18:23:30 +0000 (-0400)
Subject: Merge branch 'update-issue-template' of https://github.com/alectrocute/lemmy-ui into...
X-Git-Url: http://these/git/?a=commitdiff_plain;h=4b52a9cced62f8962192621332adadb2e8d6107e;hp=dd4b60d22460cda70097a086b852630f2d105083;p=lemmy-ui.git
Merge branch 'update-issue-template' of https://github.com/alectrocute/lemmy-ui into update-issue-template
---
diff --git a/src/server/utils/create-ssr-html.tsx b/src/server/utils/create-ssr-html.tsx
index ae766b3..1377598 100644
--- a/src/server/utils/create-ssr-html.tsx
+++ b/src/server/utils/create-ssr-html.tsx
@@ -4,6 +4,7 @@ import serialize from "serialize-javascript";
import sharp from "sharp";
import { favIconPngUrl, favIconUrl } from "../../shared/config";
import { ILemmyConfig, IsoDataOptionalSite } from "../../shared/interfaces";
+import { buildThemeList } from "./build-themes-list";
import { fetchIconPng } from "./fetch-icon-png";
const customHtmlHeader = process.env["LEMMY_UI_CUSTOM_HTML_HEADER"] || "";
@@ -16,6 +17,10 @@ export async function createSsrHtml(
) {
const site = isoData.site_res;
+ const fallbackTheme = ``;
+
if (!appleTouchIcon) {
appleTouchIcon = site?.site_view.site.icon
? `data:image/png;base64,${sharp(
@@ -68,7 +73,7 @@ export async function createSsrHtml(
-
+
- ${helmet.link.toString()}
+ ${helmet.link.toString() || fallbackTheme}
diff --git a/src/shared/components/common/pictrs-image.tsx b/src/shared/components/common/pictrs-image.tsx
index 7443749..31fb122 100644
--- a/src/shared/components/common/pictrs-image.tsx
+++ b/src/shared/components/common/pictrs-image.tsx
@@ -22,7 +22,7 @@ export class PictrsImage extends Component {
render() {
return (
-
+
@@ -31,7 +31,7 @@ export class PictrsImage extends Component {
alt={this.alt()}
title={this.alt()}
loading="lazy"
- className={classNames({
+ className={classNames("overflow-hidden pictrs-image", {
"img-fluid": !this.props.icon && !this.props.iconOverlay,
banner: this.props.banner,
"thumbnail rounded":
diff --git a/src/shared/components/common/sort-select.tsx b/src/shared/components/common/sort-select.tsx
index 90515d5..4d03ab5 100644
--- a/src/shared/components/common/sort-select.tsx
+++ b/src/shared/components/common/sort-select.tsx
@@ -67,6 +67,13 @@ export class SortSelect extends Component {
+
+
+