]> Untitled Git - lemmy.git/commitdiff
Merge branch 'Axighi-master' into front_end_prettying
authorDessalines <tyhou13@gmx.com>
Wed, 29 Jul 2020 04:24:49 +0000 (00:24 -0400)
committerDessalines <tyhou13@gmx.com>
Wed, 29 Jul 2020 04:24:49 +0000 (00:24 -0400)
1  2 
ui/src/components/community.tsx
ui/src/components/inbox.tsx
ui/src/components/user.tsx

Simple merge
index 1c94032b384a53a648149446966504ce233dcc8c,927fee24ceebbc2b27d528685edf73b8548efa3e..eff7efcf18f91f40ed0f7544bcf3a7ebc752541f
@@@ -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'}
            `}
          >
index 03b8b8a4f3fa4cb28a74ccbe5cc23214408f52d3,89e8253987d95ffc159d0f111b6bd2750c38c596..e4d4439b1ac03e1a94e9e2bb9c9d607797865f23
@@@ -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'}
            `}
          >