From: Jay Sitter <jay@jaysitter.com>
Date: Sun, 25 Jun 2023 05:05:36 +0000 (-0400)
Subject: Merge remote-tracking branch 'lemmy/main' into fix/a11y-fixes-2
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%22https:/nerdica.net/%7Bthis.props.imageSrc%7D?a=commitdiff_plain;h=e09b1f53d3eb84d7ea179c6396c8fb75602f8083;p=lemmy-ui.git

Merge remote-tracking branch 'lemmy/main' into fix/a11y-fixes-2

* lemmy/main: (38 commits)
  chore: Empty commit to re-trigger Woodpecker
  fix(a11y): Fix non-list item being inside ul list in navbar
  fix: Fix non-unique ID attribute on re-used element
  fix: Fix another class
  fix: Fix some Bootstrap 5 font classes
  fix: Fix some emoji escape logic
  fix: Button doesn't need tabindex
  fix: Fix incorrect function reference
  fix: Emoji picker can be closed with escape key, other a11y fixes
  fix: Fix some a11y issues on jump to content button
  fix: Clarify a comment
  fix: Fix merge error
  Remove federation worker count
  fix: Add triangle alert icon to language warning
  added litely-compact
  changed where custom compact code goes
  added darkly-compact - issue 552
  Refactor first load handling
  Fix issue when navigating awat from settings
  Give function better name
  ...
---

e09b1f53d3eb84d7ea179c6396c8fb75602f8083
diff --cc src/shared/components/common/image-upload-form.tsx
index 8ece39e,283a87e..e8005cc
--- a/src/shared/components/common/image-upload-form.tsx
+++ b/src/shared/components/common/image-upload-form.tsx
@@@ -33,15 -33,10 +33,12 @@@ export class ImageUploadForm extends Co
    render() {
      return (
        <form className="image-upload-form d-inline">
-         <label
-           htmlFor={this.id}
-           className="pointer text-muted small font-weight-bold"
-         >
+         <label htmlFor={this.id} className="pointer text-muted small fw-bold">
            {this.props.imageSrc ? (
              <span className="d-inline-block position-relative">
 +              {/* TODO: Create "Current Iamge" translation for alt text */}
                <img
 +                alt=""
                  src={this.props.imageSrc}
                  height={this.props.rounded ? 60 : ""}
                  width={this.props.rounded ? 60 : ""}