From 38d2131bd8af4d4b9e853f15895380e5b11dc58b Mon Sep 17 00:00:00 2001 From: awesomerobot Date: Mon, 4 Jul 2016 11:36:59 -0400 Subject: [PATCH] fixing usercard/profile mentions and staff counter bottom spacing --- app/assets/stylesheets/desktop/user-card.scss | 3 ++- app/assets/stylesheets/desktop/user.scss | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss index 687534cdf72..f79eb81c47b 100644 --- a/app/assets/stylesheets/desktop/user-card.scss +++ b/app/assets/stylesheets/desktop/user-card.scss @@ -151,8 +151,9 @@ $user_card_background: $secondary; } a.mention { - background-color: scale-color($user_card_primary, $lightness: -60%); + text-decoration: none; } + .overflow { max-height: 60px; overflow: hidden; diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 12d53ebc223..d3ab73c465a 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -369,14 +369,14 @@ overflow: auto; max-width: 750px; - a.mention { - background-color: dark-light-diff($secondary, $primary, 20%, -50%); - } - a[href] { text-decoration: underline; } + a.mention { + text-decoration: none; + } + img { max-width: 100%; } @@ -576,6 +576,7 @@ text-align: left; background: $primary; color: $secondary; + margin-bottom: 20px; a { color: $secondary; }