From 00db0d878fed3f600e055f9a32ad4fab1ddfb9db Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 10 Jul 2015 14:41:38 -0700 Subject: [PATCH] manually revert heart color change --- app/assets/stylesheets/common.scss | 2 -- app/assets/stylesheets/common/base/directory.scss | 1 + app/assets/stylesheets/desktop/topic-post.scss | 10 +--------- app/assets/stylesheets/mobile/directory.scss | 3 +++ 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 75603ec62d4..3ffc2babd97 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -9,5 +9,3 @@ @import "common/input_tip"; @import "common/topic-entrance"; @import "common/base/*"; - -.fa-heart:before { color: $love; } diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss index 39db7acdad0..7170b092188 100644 --- a/app/assets/stylesheets/common/base/directory.scss +++ b/app/assets/stylesheets/common/base/directory.scss @@ -46,6 +46,7 @@ width: 13%; i.fa-heart { + color: $love; margin-right: 0.5em; } i.fa-chevron-down, i.fa-chevron-up { diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 4cde82c8df3..8f051d1e923 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -177,16 +177,8 @@ nav.post-controls { color: $secondary; } - &.like { - i.fa-heart:before { - color: scale-color($primary, $lightness: 60%); - } - } - &.like:hover { - i.fa-heart:before { - color: $love; - } + color: $love; background: dark-light-diff($love, $secondary, 85%, -60%) } diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss index e664541eafd..bbdbf8cf02b 100644 --- a/app/assets/stylesheets/mobile/directory.scss +++ b/app/assets/stylesheets/mobile/directory.scss @@ -40,6 +40,9 @@ margin-left: 0.2em; color: dark-light-diff($primary, $secondary, 50%, -50%); } + i.fa-heart { + color: $love; + } } margin-bottom: 1em; }