From eb97fb6ee74798f197beabea5a3510e35f56c41a Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 12 Jun 2015 23:27:59 +0800 Subject: [PATCH] UX: Seeing black hearts make me sad. --- 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 | 4 ---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 3ffc2babd..75603ec62 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -9,3 +9,5 @@ @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 67c6c2c87..373481c84 100644 --- a/app/assets/stylesheets/common/base/directory.scss +++ b/app/assets/stylesheets/common/base/directory.scss @@ -46,7 +46,6 @@ 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 09ee59187..b040d96cf 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -160,8 +160,16 @@ nav.post-controls { color: $secondary; } + &.like { + i.fa-heart:before { + color: scale-color($primary, $lightness: 60%); + } + } + &.like:hover { - color: $love; + i.fa-heart:before { + 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 e1229ad08..e664541ea 100644 --- a/app/assets/stylesheets/mobile/directory.scss +++ b/app/assets/stylesheets/mobile/directory.scss @@ -40,10 +40,6 @@ margin-left: 0.2em; color: dark-light-diff($primary, $secondary, 50%, -50%); } - - i.fa-heart { - color: $love; - } } margin-bottom: 1em; }