From: Dessalines <tyhou13@gmx.com>
Date: Wed, 29 Jul 2020 04:24:49 +0000 (-0400)
Subject: Merge branch 'Axighi-master' into front_end_prettying
X-Git-Url: http://these/git/%22%7Burl%7D/%22https:/image.com/%7B%60%24%7BghostArchiveUrl%7D/%7BimageSrc%7D?a=commitdiff_plain;h=ff7e0c72f9f568b2929310e15643a4dafd4a0bcc;p=lemmy.git

Merge branch 'Axighi-master' into front_end_prettying
---

ff7e0c72f9f568b2929310e15643a4dafd4a0bcc
diff --cc ui/src/components/inbox.tsx
index 1c94032b,927fee24..eff7efcf
--- a/ui/src/components/inbox.tsx
+++ b/ui/src/components/inbox.tsx
@@@ -204,9 -204,9 +204,9 @@@ export class Inbox extends Component<an
  
    messageTypeRadios() {
      return (
 -      <div class="btn-group btn-group-toggle">
 +      <div class="btn-group btn-group-toggle flex-wrap mb-2">
          <label
-           className={`btn btn-outline-secondary pointer 
+           className={`btn btn-outline-secondary pointer
              ${this.state.messageType == MessageType.All && 'active'}
            `}
          >
diff --cc ui/src/components/user.tsx
index 03b8b8a4,89e82539..e4d4439b
--- a/ui/src/components/user.tsx
+++ b/ui/src/components/user.tsx
@@@ -274,9 -274,9 +274,9 @@@ export class User extends Component<any
  
    viewRadios() {
      return (
 -      <div class="btn-group btn-group-toggle">
 +      <div class="btn-group btn-group-toggle flex-wrap mb-2">
          <label
-           className={`btn btn-outline-secondary pointer 
+           className={`btn btn-outline-secondary pointer
              ${this.state.view == UserDetailsView.Overview && 'active'}
            `}
          >