From: Dessalines <tyhou13@gmx.com>
Date: Thu, 11 Feb 2021 20:43:06 +0000 (-0500)
Subject: Merge branch 'main' into more_accessibility
X-Git-Url: http://these/git/%24%7B%60data:application/static/%7B%60https:/%7Brss%7D?a=commitdiff_plain;h=58bbb51f8f336b8a15d51c0ebfb4f62186969469;p=lemmy-ui.git

Merge branch 'main' into more_accessibility
---

58bbb51f8f336b8a15d51c0ebfb4f62186969469
diff --cc src/shared/components/login.tsx
index 4a75e45,94c685d..ea37d1e
--- a/src/shared/components/login.tsx
+++ b/src/shared/components/login.tsx
@@@ -260,11 -253,8 +253,9 @@@ export class Login extends Component<an
                  type="button"
                  class="btn btn-secondary"
                  onClick={linkEvent(this, this.handleRegenCaptcha)}
 +                aria-label={i18n.t('captcha')}
                >
-                 <svg class="icon icon-refresh-cw">
-                   <use xlinkHref="#icon-refresh-cw"></use>
-                 </svg>
+                 <Icon icon="refresh-cw" classes="icon-refresh-cw" />
                </button>
              </label>
              {this.showCaptcha()}
diff --cc src/shared/components/markdown-textarea.tsx
index fe34b20,bc53c74..67d5c41
--- a/src/shared/components/markdown-textarea.tsx
+++ b/src/shared/components/markdown-textarea.tsx
@@@ -183,32 -179,23 +182,26 @@@ export class MarkdownTextArea extends C
              <button
                class="btn btn-sm text-muted"
                data-tippy-content={i18n.t('bold')}
 +              aria-label={i18n.t('bold')}
                onClick={linkEvent(this, this.handleInsertBold)}
              >
-               <svg class="icon icon-inline">
-                 <use xlinkHref="#icon-bold"></use>
-               </svg>
+               <Icon icon="bold" classes="icon-inline" />
              </button>
              <button
                class="btn btn-sm text-muted"
                data-tippy-content={i18n.t('italic')}
 +              aria-label={i18n.t('italic')}
                onClick={linkEvent(this, this.handleInsertItalic)}
              >
-               <svg class="icon icon-inline">
-                 <use xlinkHref="#icon-italic"></use>
-               </svg>
+               <Icon icon="italic" classes="icon-inline" />
              </button>
              <button
                class="btn btn-sm text-muted"
                data-tippy-content={i18n.t('link')}
 +              aria-label={i18n.t('link')}
                onClick={linkEvent(this, this.handleInsertLink)}
              >
-               <svg class="icon icon-inline">
-                 <use xlinkHref="#icon-link"></use>
-               </svg>
+               <Icon icon="link" classes="icon-inline" />
              </button>
              <form class="btn btn-sm text-muted font-weight-bold">
                <label
diff --cc src/shared/components/navbar.tsx
index dee3fc5,a0ba817..d1a8027
--- a/src/shared/components/navbar.tsx
+++ b/src/shared/components/navbar.tsx
@@@ -198,16 -199,9 +199,14 @@@ export class Navbar extends Component<N
                to="/inbox"
                title={i18n.t('inbox')}
              >
-               <svg class="icon">
-                 <use xlinkHref="#icon-bell"></use>
-               </svg>
+               <Icon icon="bell" />
                {this.state.unreadCount > 0 && (
 -                <span class="mx-1 badge badge-light">
 +                <span
 +                  class="mx-1 badge badge-light"
 +                  aria-label={`${this.state.unreadCount} ${i18n.t(
 +                    'unread_messages'
 +                  )}`}
 +                >
                    {this.state.unreadCount}
                  </span>
                )}
@@@ -312,11 -296,8 +305,9 @@@
                    onClick={linkEvent(this, this.handleSearchBtn)}
                    class="px-1 btn btn-link"
                    style="color: var(--gray)"
 +                  aria-label={i18n.t('search')}
                  >
-                   <svg class="icon">
-                     <use xlinkHref="#icon-search"></use>
-                   </svg>
+                   <Icon icon="search" />
                  </button>
                </form>
              )}
@@@ -329,16 -310,9 +320,14 @@@
                        to="/inbox"
                        title={i18n.t('inbox')}
                      >
-                       <svg class="icon">
-                         <use xlinkHref="#icon-bell"></use>
-                       </svg>
+                       <Icon icon="bell" />
                        {this.state.unreadCount > 0 && (
 -                        <span class="ml-1 badge badge-light">
 +                        <span
 +                          class="ml-1 badge badge-light"
 +                          aria-label={`${this.state.unreadCount} ${i18n.t(
 +                            'unread_messages'
 +                          )}`}
 +                        >
                            {this.state.unreadCount}
                          </span>
                        )}
diff --cc src/shared/components/post-listing.tsx
index 1255b3d,d68805b..715bb30
--- a/src/shared/components/post-listing.tsx
+++ b/src/shared/components/post-listing.tsx
@@@ -681,11 -639,8 +639,9 @@@ export class PostListing extends Compon
                  class="btn btn-link btn-animate text-muted py-0"
                  onClick={linkEvent(this, this.handleEditClick)}
                  data-tippy-content={i18n.t('edit')}
 +                aria-label={i18n.t('edit')}
                >
-                 <svg class="icon icon-inline">
-                   <use xlinkHref="#icon-edit"></use>
-                 </svg>
+                 <Icon icon="edit" classes="icon-inline" />
                </button>
                <button
                  class="btn btn-link btn-animate text-muted py-0"
@@@ -693,17 -648,13 +649,16 @@@
                  data-tippy-content={
                    !post_view.post.deleted ? i18n.t('delete') : i18n.t('restore')
                  }
 +                aria-label={
 +                  !post_view.post.deleted ? i18n.t('delete') : i18n.t('restore')
 +                }
                >
-                 <svg
-                   class={`icon icon-inline ${
+                 <Icon
+                   icon="trash"
+                   classes={`icon-inline ${
                      post_view.post.deleted && 'text-danger'
                    }`}
-                 >
-                   <use xlinkHref="#icon-trash"></use>
-                 </svg>
+                 />
                </button>
              </>
            )}
@@@ -726,15 -675,13 +679,14 @@@
                    class="btn btn-link btn-animate text-muted py-0"
                    onClick={linkEvent(this, this.handleViewSource)}
                    data-tippy-content={i18n.t('view_source')}
 +                  aria-label={i18n.t('view_source')}
                  >
-                   <svg
-                     class={`icon icon-inline ${
+                   <Icon
+                     icon="file-text"
+                     classes={`icon-inline ${
                        this.state.viewSource && 'text-success'
                      }`}
-                   >
-                     <use xlinkHref="#icon-file-text"></use>
-                   </svg>
+                   />
                  </button>
                )}
                {this.canModOnSelf && (
@@@ -745,17 -692,13 +697,16 @@@
                      data-tippy-content={
                        post_view.post.locked ? i18n.t('unlock') : i18n.t('lock')
                      }
 +                    aria-label={
 +                      post_view.post.locked ? i18n.t('unlock') : i18n.t('lock')
 +                    }
                    >
-                     <svg
-                       class={`icon icon-inline ${
+                     <Icon
+                       icon="lock"
+                       classes={`icon-inline ${
                          post_view.post.locked && 'text-danger'
                        }`}
-                     >
-                       <use xlinkHref="#icon-lock"></use>
-                     </svg>
+                     />
                    </button>
                    <button
                      class="btn btn-link btn-animate text-muted py-0"
@@@ -765,19 -708,13 +716,18 @@@
                          ? i18n.t('unsticky')
                          : i18n.t('sticky')
                      }
 +                    aria-label={
 +                      post_view.post.stickied
 +                        ? i18n.t('unsticky')
 +                        : i18n.t('sticky')
 +                    }
                    >
-                     <svg
-                       class={`icon icon-inline ${
+                     <Icon
+                       icon="pin"
+                       classes={`icon-inline ${
                          post_view.post.stickied && 'text-success'
                        }`}
-                     >
-                       <use xlinkHref="#icon-pin"></use>
-                     </svg>
+                     />
                    </button>
                  </>
                )}