From: Jay Sitter Date: Sun, 2 Jul 2023 22:59:15 +0000 (-0400) Subject: Merge branch 'main' into fix/fix-badges-spacing-componentize X-Git-Url: http://these/git/?a=commitdiff_plain;h=50b1a395f151521fb222f495b2edbade3dcd4af3;hp=9869b911cf480ee88c7b1e7d2f689cc2e1c65157;p=lemmy-ui.git Merge branch 'main' into fix/fix-badges-spacing-componentize --- diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 648e76d..b92f086 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -254,10 +254,6 @@ hr { -ms-filter: blur(10px); } -.img-cover { - object-fit: cover; -} - .img-expanded { max-height: 90vh; } @@ -350,10 +346,12 @@ br.big { } .avatar-overlay { - width: 20%; - height: 20%; + width: 20vw; + height: 20vw; max-width: 120px; max-height: 120px; + min-width: 80px; + min-height: 80px; } .avatar-pushup { diff --git a/src/shared/components/app/error-page.tsx b/src/shared/components/app/error-page.tsx index ec352d4..e083276 100644 --- a/src/shared/components/app/error-page.tsx +++ b/src/shared/components/app/error-page.tsx @@ -1,4 +1,5 @@ import { setIsoData } from "@utils/app"; +import { removeAuthParam } from "@utils/helpers"; import { Component } from "inferno"; import { T } from "inferno-i18next-dess"; import { Link } from "inferno-router"; @@ -58,7 +59,7 @@ export class ErrorPage extends Component { ### diff --git a/src/shared/components/common/image-upload-form.tsx b/src/shared/components/common/image-upload-form.tsx index 854e710..890f47f 100644 --- a/src/shared/components/common/image-upload-form.tsx +++ b/src/shared/components/common/image-upload-form.tsx @@ -1,4 +1,5 @@ import { randomStr } from "@utils/helpers"; +import classNames from "classnames"; import { Component, linkEvent } from "inferno"; import { HttpService, I18NextService, UserService } from "../../services"; import { toast } from "../../toast"; @@ -33,38 +34,35 @@ export class ImageUploadForm extends Component< render() { return (
- + {this.props.imageSrc && ( + + {/* TODO: Create "Current Iamge" translation for alt text */} + + + + )} diff --git a/src/shared/components/common/markdown-textarea.tsx b/src/shared/components/common/markdown-textarea.tsx index a4ac292..1a707a2 100644 --- a/src/shared/components/common/markdown-textarea.tsx +++ b/src/shared/components/common/markdown-textarea.tsx @@ -173,6 +173,9 @@ export class MarkdownTextArea extends Component<