]> cat aescling's git repositories - mastodon.git/commitdiff
[Glitch] Change layout of public profile directory to be the same as in web UI
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 30 Aug 2019 05:41:16 +0000 (07:41 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sat, 31 Aug 2019 16:23:24 +0000 (18:23 +0200)
Port 987190417228bb56041ea824772341f07f4263d6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
app/javascript/flavours/glitch/features/directory/components/account_card.js
app/javascript/flavours/glitch/styles/containers.scss

index e4203541c8d17346494f935665438308aff98478..7bab0db0ba2173b49c1aee95b4f5b50cbfdb4505 100644 (file)
@@ -119,7 +119,7 @@ class AccountCard extends ImmutablePureComponent {
     return (
       <div className='directory__card'>
         <div className='directory__card__img'>
-          <img src={autoPlayGif ? account.get('header') : account.get('header_static')} alt='' className='parallax' />
+          <img src={autoPlayGif ? account.get('header') : account.get('header_static')} alt='' />
         </div>
 
         <div className='directory__card__bar'>
@@ -134,7 +134,7 @@ class AccountCard extends ImmutablePureComponent {
         </div>
 
         <div className='directory__card__extra'>
-          {account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content' dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }} />}
+          <div className='account__header__content' dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }} />
         </div>
 
         <div className='directory__card__extra'>
index 130e1461cc812bfc20509f67b60fee4525117c8c..45eb5a9d09dbd0f247549db1a9c250642f15f921 100644 (file)
     }
   }
 
+  .directory__list {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: minmax(0, 50%) minmax(0, 50%);
+
+    @media screen and (max-width: $no-gap-breakpoint) {
+      display: block;
+    }
+
+    .icon-button {
+      font-size: 18px;
+    }
+  }
+
+  .directory__card {
+    margin-bottom: 0;
+  }
+
   .card-grid {
     display: flex;
     flex-wrap: wrap;