From dc9f1acfb359a605b9db88d93f325d31346b8f85 Mon Sep 17 00:00:00 2001 From: xaviju Date: Fri, 20 Jan 2017 09:37:05 +0100 Subject: [PATCH] Remove hover in selected filters --- scsslint.yml => .scss-lint.yml | 0 app/modules/components/filter/filter.scss | 15 ++++++++++++--- gulpfile.js | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) rename scsslint.yml => .scss-lint.yml (100%) diff --git a/scsslint.yml b/.scss-lint.yml similarity index 100% rename from scsslint.yml rename to .scss-lint.yml diff --git a/app/modules/components/filter/filter.scss b/app/modules/components/filter/filter.scss index 0f3abaf3..109b78cf 100644 --- a/app/modules/components/filter/filter.scss +++ b/app/modules/components/filter/filter.scss @@ -13,6 +13,14 @@ tg-filter { z-index: 1; .filters-applied { padding: 0 1rem 1rem; + .single-filter { + &:hover { + color: currentColor; + cursor: default; + opacity: .5; + transition: none; + } + } } h1, form { @@ -69,7 +77,7 @@ tg-filter { transition: color .2s ease-in; &:hover, &.selected { - background-color: rgba(darken($whitish, 20%), 1); + background-color: rgba(darken($whitish, 10%), 1); color: $grayer; transition: background-color .2s ease-in; .icon { @@ -92,7 +100,7 @@ tg-filter { @include font-type(text); @include clearfix; align-items: center; - background: darken($whitish, 10%); // Fallback + background: darken($whitish, 5%); cursor: pointer; display: flex; justify-content: space-between; @@ -101,7 +109,7 @@ tg-filter { padding-right: .5rem; position: relative; &:hover { - color: $grayer; + background: darken($whitish, 8%); opacity: 1; transition: opacity .2s linear; } @@ -127,6 +135,7 @@ tg-filter { top: 0; } .remove-filter { + cursor: pointer; display: block; svg { fill: $gray; diff --git a/gulpfile.js b/gulpfile.js index f06b4201..f141184e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -270,7 +270,7 @@ gulp.task("scss-lint", [], function() { var sassFiles = paths.sass.concat(themes.current.customScss, ignore); return gulp.src(sassFiles) - .pipe(gulpif(!isDeploy, cache(scsslint({endless: true, sync: true, config: "scsslint.yml"}), { + .pipe(gulpif(!isDeploy, cache(scsslint({endless: true, sync: true, config: ".scss-lint.yml"}), { success: function(scsslintFile) { return scsslintFile.scsslint.success; },