From 280895a0731bfd23a868dca72b0475d0d0590e4d Mon Sep 17 00:00:00 2001 From: mgabdev <> Date: Tue, 10 Sep 2019 00:05:37 -0400 Subject: [PATCH] Updated status card Check for if cardImg exists and if is interactive to set image accordingly. Updated action button color to primary as it stands out more. --- app/javascript/gabsocial/features/status/components/card.js | 4 ++-- app/javascript/styles/gabsocial/components.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/javascript/gabsocial/features/status/components/card.js b/app/javascript/gabsocial/features/status/components/card.js index 31df9726..5c248eeb 100644 --- a/app/javascript/gabsocial/features/status/components/card.js +++ b/app/javascript/gabsocial/features/status/components/card.js @@ -151,7 +151,7 @@ export default class Card extends React.PureComponent { const className = classnames('status-card', { horizontal, interactive, - compact: !cardImg, + compact: !cardImg && !interactive, }); const title = interactive ? @@ -172,7 +172,7 @@ export default class Card extends React.PureComponent { ); let embed = ''; - let thumbnail =
; + let thumbnail = card ?
: thumbnail =
; if (interactive) { if (embedded) { diff --git a/app/javascript/styles/gabsocial/components.scss b/app/javascript/styles/gabsocial/components.scss index 79a05d2d..d523001a 100644 --- a/app/javascript/styles/gabsocial/components.scss +++ b/app/javascript/styles/gabsocial/components.scss @@ -2225,7 +2225,7 @@ a.account__display-name { button, a { display: inline; - color: $secondary-text-color; + color: $primary-text-color; background: transparent; border: 0; padding: 0 8px;