From a8e6e1e3d5fc0e173c23f0d03fd86f8d7a03c320 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Fri, 22 Aug 2014 10:45:51 -0400 Subject: [PATCH] adding highlight back to topic-list --- app/assets/stylesheets/common/base/_topic-list.scss | 3 --- app/assets/stylesheets/common/base/discourse.scss | 10 ++++++++++ app/assets/stylesheets/desktop/topic-list.scss | 3 +++ app/assets/stylesheets/desktop/topic-post.scss | 10 ---------- app/assets/stylesheets/mobile/topic-list.scss | 3 +++ 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index 2493d54812d..3b433b5f2c0 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -29,9 +29,6 @@ vertical-align: top; margin-top: 2px; } - &.highlighted { - background-color: scale-color($tertiary, $lightness: 85%); - } } th, diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index e17208165ce..0d4ad381658 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -185,3 +185,13 @@ body { background: $success; &.badge-notification[href] {color: $secondary;} } + +.fade { + opacity: 0; + -webkit-transition: opacity 0.15s linear; + transition: opacity 0.15s linear; +} + +.fade.in { + opacity: 1; +} diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 12708946b60..64c303a450a 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -68,6 +68,9 @@ &:nth-child(odd) { background-color: $secondary; } + &.highlighted { + background-color: scale-color($tertiary, $lightness: 85%); + } } button.bulk-select { padding: 0; diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 1e7fd6ea7e6..794e4a437be 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -879,16 +879,6 @@ $topic-avatar-width: 45px; clear: both; } -.fade { - opacity: 0; - -webkit-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; -} - -.fade.in { - opacity: 1; -} - #selected-posts { padding-left: 20px; diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 8de4ffad9ab..bf0d4873c68 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -36,6 +36,9 @@ &:nth-child(even) { background-color: $secondary; } + &.highlighted { + background-color: scale-color($tertiary, $lightness: 85%); + } } th,