From d89e9fcfa39d3059b42b6091e1de40873f07ffe2 Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 15 Apr 2021 16:34:47 -0400 Subject: [PATCH] FIX: remove old usercard styles, fix bg img class (#12712) --- .../discourse/app/components/user-card-contents.js | 2 +- app/assets/stylesheets/common/components/user-card.scss | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js index a2f66957b7..aec5a99ed4 100644 --- a/app/assets/javascripts/discourse/app/components/user-card-contents.js +++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js @@ -20,7 +20,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, { classNameBindings: [ "visible:show", "showBadges", - "user.card_background::no-bg", + "user.card_background_upload_url::no-bg", "isFixed:fixed", "usernameClass", ], diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss index 1d647f2faa..5f31e02118 100644 --- a/app/assets/stylesheets/common/components/user-card.scss +++ b/app/assets/stylesheets/common/components/user-card.scss @@ -48,7 +48,6 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards .card-content { padding: 10px; background: rgba(var(--secondary-rgb), 0.85); - margin-top: 80px; &:after { content: ""; display: block; @@ -61,11 +60,6 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards @include line-clamp(2); } } - &.no-bg { - .card-content { - margin-top: 0; - } - } .card-row:not(.first-row) { margin-top: 0.5em; }