From 3087cb3cbe2762cd75cf87fec725b69a266bc73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 29 Oct 2014 16:22:34 +0100 Subject: [PATCH] Fix CSS errors in linter --- app/styles/layout/us-detail.scss | 10 +++++----- app/styles/modules/admin/admin-menu.scss | 5 ++++- app/styles/modules/admin/project-values.scss | 2 +- app/styles/modules/filters/list-filters.scss | 6 +++++- app/styles/modules/search/search-filter.scss | 9 ++++++--- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 4cf822e6..a9c813d6 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -242,11 +242,11 @@ &:last-child { margin: 0; } - &.clickable { - &:hover { - @include transition(background .2s ease-in); - background: darken($whitish, 10%); - } + } + .clickable { + &:hover { + @include transition(background .2s ease-in); + background: darken($whitish, 10%); } } .level { diff --git a/app/styles/modules/admin/admin-menu.scss b/app/styles/modules/admin/admin-menu.scss index bc6bd31a..99ab5cbf 100644 --- a/app/styles/modules/admin/admin-menu.scss +++ b/app/styles/modules/admin/admin-menu.scss @@ -11,7 +11,6 @@ a { display: block; padding: 1rem 0 1rem 1rem; - &.active, &:hover { .icon { @include transition (opacity .3s linear); @@ -19,6 +18,10 @@ } } } + .active { + @include transition (opacity .3s linear); + opacity: 1; + } .icon { color: $blackish; float: right; diff --git a/app/styles/modules/admin/project-values.scss b/app/styles/modules/admin/project-values.scss index 1c1f8571..46fabb7e 100644 --- a/app/styles/modules/admin/project-values.scss +++ b/app/styles/modules/admin/project-values.scss @@ -56,7 +56,7 @@ &:hover { @include transition(color .3s linear); color: $green-taiga; - &.icon-delete { + .icon-delete { color: $red; } } diff --git a/app/styles/modules/filters/list-filters.scss b/app/styles/modules/filters/list-filters.scss index 06e0a234..29753c6c 100644 --- a/app/styles/modules/filters/list-filters.scss +++ b/app/styles/modules/filters/list-filters.scss @@ -15,7 +15,6 @@ @extend %large; @extend %title; opacity: .4; - &.active, &:hover { @include transition (opacity .3s linear); color: $blackish; @@ -23,6 +22,11 @@ } } + .active { + @include transition (opacity .3s linear); + color: $blackish; + opacity: 1; + } .icon { padding-right: .5rem; } diff --git a/app/styles/modules/search/search-filter.scss b/app/styles/modules/search/search-filter.scss index 6ef3ab9c..b9aa3314 100644 --- a/app/styles/modules/search/search-filter.scss +++ b/app/styles/modules/search/search-filter.scss @@ -11,18 +11,21 @@ @extend %large; @extend %title; opacity: .2; - &.active, &:hover { @include transition (opacity .3s linear); color: $blackish; opacity: 1; } } + .active { + @include transition (opacity .3s linear); + color: $blackish; + opacity: 1; + } .icon { margin-right: .4rem; } - - span.name { + .name { padding-left: 5px; } }