From 5c0bb56748b77c6164ef777705dc47ebf766430c Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 10 Oct 2014 15:02:46 -0700 Subject: [PATCH] remove unnecessary @includes on box-shadow --- app/assets/stylesheets/common/base/_topic-list.scss | 4 ++-- app/assets/stylesheets/common/base/header.scss | 2 +- app/assets/stylesheets/common/components/badges.css.scss | 2 +- app/assets/stylesheets/common/components/banner.css.scss | 2 +- app/assets/stylesheets/common/components/buttons.css.scss | 2 +- app/assets/stylesheets/common/topic-entrance.scss | 2 +- app/assets/stylesheets/desktop/compose.scss | 2 +- app/assets/stylesheets/desktop/topic-list.scss | 2 +- app/assets/stylesheets/desktop/topic-post.scss | 8 ++++---- app/assets/stylesheets/mobile/topic-post.scss | 4 ---- app/assets/stylesheets/mobile/topic.scss | 2 +- 11 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index cee6e3da565..36a6ab6ae59 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -127,7 +127,7 @@ .loading .topic-list { border: 0; - @include box-shadow(none); + box-shadow: none; tr { background-color: transparent; } @@ -263,7 +263,7 @@ ol.category-breadcrumb { background: $secondary; position: absolute; z-index: 1110; - @include box-shadow(0 2px 2px rgba(0,0,0, .4)); + box-shadow: 0 2px 2px rgba(0,0,0, .4); ul { list-style: none; diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss index 183a9a27c62..38660a748a3 100644 --- a/app/assets/stylesheets/common/base/header.scss +++ b/app/assets/stylesheets/common/base/header.scss @@ -144,7 +144,7 @@ border: 1px solid scale-color-diff(); padding: 5px; - @include box-shadow(0 2px 2px rgba(0,0,0, .4)); + box-shadow: 0 2px 2px rgba(0,0,0, .4); // note these topic counts only appear for anons in the category hamburger drop down b.topics-count { diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index 5c771288a2a..3525a141199 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -128,5 +128,5 @@ h1 a.badge-category div {vertical-align: top;} background-color: dark-light-diff($primary, $secondary, 90%, -65%); border-color: dark-light-diff($primary, $secondary, 90%, -65%); font-size: 12px; - @include box-shadow(inset 0 1px 0 rgba(0,0,0, 0.22)); + box-shadow: inset 0 1px 0 rgba(0,0,0, 0.22); } diff --git a/app/assets/stylesheets/common/components/banner.css.scss b/app/assets/stylesheets/common/components/banner.css.scss index 7ab2422d1a7..a18805bc53b 100644 --- a/app/assets/stylesheets/common/components/banner.css.scss +++ b/app/assets/stylesheets/common/components/banner.css.scss @@ -6,7 +6,7 @@ padding: 10px; border-radius: 5px; background: scale-color($tertiary, $lightness: 90%); - @include box-shadow(0 1px 2px scale-color($tertiary, $lightness: 70%)); + box-shadow: 0 1px 2px scale-color($tertiary, $lightness: 70%); z-index: 501; overflow: auto; diff --git a/app/assets/stylesheets/common/components/buttons.css.scss b/app/assets/stylesheets/common/components/buttons.css.scss index 598c3d7e28e..e21b1a663de 100644 --- a/app/assets/stylesheets/common/components/buttons.css.scss +++ b/app/assets/stylesheets/common/components/buttons.css.scss @@ -122,7 +122,7 @@ .btn-social { color: $secondary; text-shadow: 0 1px 0 rgba($primary, 0.2); - @include box-shadow(inset 0 1px 0 rgba(0,0,0, 0.1)); + box-shadow: inset 0 1px 0 rgba(0,0,0, 0.1); &[href] { color: $secondary; } diff --git a/app/assets/stylesheets/common/topic-entrance.scss b/app/assets/stylesheets/common/topic-entrance.scss index 926347229b2..24e2d60d05c 100644 --- a/app/assets/stylesheets/common/topic-entrance.scss +++ b/app/assets/stylesheets/common/topic-entrance.scss @@ -3,7 +3,7 @@ border: 1px solid scale-color-diff(); padding: 5px; background: $secondary; - @include box-shadow(0 0px 2px rgba(0,0,0, .2)); + box-shadow: 0 0px 2px rgba(0,0,0, .2); z-index: 100; position: absolute; diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index 9cd2125e83b..c3f534ba481 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -22,7 +22,7 @@ .composer-popup { - @include box-shadow(3px 3px 3px rgba(0,0,0, 0.34)); + box-shadow: 3px 3px 3px rgba(0,0,0, 0.34); background: dark-light-diff($highlight, $secondary, 50%, -80%); &.urgent { diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 879c79831d1..a15e3c63567 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -124,7 +124,7 @@ } .avatar { &.latest:not(.single) { - @include box-shadow(0 0 6px 1px desaturate(scale-color($tertiary, $lightness: 30%), 35%)); + box-shadow: 0 0 6px 1px desaturate(scale-color($tertiary, $lightness: 30%), 35%); } } diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 359a710c351..313d1ad7dc5 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -130,7 +130,7 @@ nav.post-controls { &:active { background: dark-light-diff($tertiary, $secondary, 50%, -35%); - @include box-shadow(inset 0 1px 3px rgba(0,0,0, .3)); + box-shadow: inset 0 1px 3px rgba(0,0,0, .3); } @@ -154,7 +154,7 @@ nav.post-controls { } &:active { - @include box-shadow(inset 0 1px 3px rgba(0,0,0, .4)); + box-shadow: inset 0 1px 3px rgba(0,0,0, .4); } &.hidden { @@ -929,7 +929,7 @@ $topic-avatar-width: 45px; } &:active { @include linear-gradient(darken($tertiary, 18%), darken($tertiary, 12%)); - @include box-shadow(inset 0 1px 3px rgba(0,0,0, 0.2)); + box-shadow: inset 0 1px 3px rgba(0,0,0, 0.2); color: $secondary; } &[disabled] { @@ -1091,7 +1091,7 @@ and (max-width : 870px) { &.top { margin-left: 6%; width: 91%; - } } + } diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index d9fb2aeb3ef..a587fe4f3df 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -134,10 +134,6 @@ a.star { font-size: 1.3em; } -#main a.star.starred { - text-shadow: none !important; -} - .topic-post .boxed .contents { float: none; padding-top: 5px; diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss index b29f5af5ba9..7982d9a0e6e 100644 --- a/app/assets/stylesheets/mobile/topic.scss +++ b/app/assets/stylesheets/mobile/topic.scss @@ -65,7 +65,7 @@ border: 1px solid scale-color-diff(); padding: 5px; background: $secondary; - @include box-shadow(0 0px 2px rgba(0,0,0, .2)); + box-shadow(0 0px 2px rgba(0,0,0, .2)); position: absolute; bottom: 34px;