From a917a9399054f27f1b6f10574466866365ebbb74 Mon Sep 17 00:00:00 2001 From: Kris Date: Wed, 6 Mar 2019 17:29:19 -0500 Subject: [PATCH] fix active class, remove style --- .../javascripts/discourse/components/edit-category-tab.js.es6 | 2 +- .../discourse/templates/components/edit-category-tab.hbs | 2 +- app/assets/stylesheets/common/components/navs.scss | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 index 87eed4459ca..7c2509f0680 100644 --- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 +++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 @@ -2,7 +2,7 @@ import { propertyEqual } from "discourse/lib/computed"; export default Ember.Component.extend({ tagName: "li", - classNameBindings: ["tabClassName"], + classNameBindings: ["active", "tabClassName"], tabClassName: function() { return "edit-category-" + this.get("tab"); diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs index b6108dfd6ad..4aeb37702a1 100644 --- a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs +++ b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs @@ -1 +1 @@ - {{title}} +{{title}} diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss index 75b797e261b..4718c1784e9 100644 --- a/app/assets/stylesheets/common/components/navs.scss +++ b/app/assets/stylesheets/common/components/navs.scss @@ -48,8 +48,7 @@ } } - &.active > a, - > a.active { + &.active > a{ color: $secondary; background-color: $quaternary;