From 5fffbb4be50c3ebc35914ccc9f746d003fbf6e2d Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 28 Feb 2017 18:42:16 -0600 Subject: [PATCH] stylesheets: fix `@import "*.css.scss"` to "*.scss". --- app/assets/stylesheets/application.scss | 8 +++----- app/assets/stylesheets/common/010_reset.scss | 2 +- app/assets/stylesheets/common/020_base.scss | 2 +- app/assets/stylesheets/common/030_links.scss | 4 ++-- app/assets/stylesheets/common/dtext.scss | 2 +- app/assets/stylesheets/common/inline.scss | 2 +- app/assets/stylesheets/common/main_layout.scss | 2 +- app/assets/stylesheets/common/page_header.scss | 2 +- app/assets/stylesheets/common/paginator.scss | 2 +- app/assets/stylesheets/common/responsive.scss | 2 +- app/assets/stylesheets/common/tables.scss | 2 +- app/assets/stylesheets/mobile.scss | 8 +++----- app/assets/stylesheets/specific/api_keys.scss | 2 +- app/assets/stylesheets/specific/artists.scss | 2 +- app/assets/stylesheets/specific/comments.scss | 2 +- app/assets/stylesheets/specific/dmails.scss | 4 ++-- app/assets/stylesheets/specific/explore.scss | 2 +- app/assets/stylesheets/specific/favorites.scss | 2 +- app/assets/stylesheets/specific/keyboard_shortcuts.scss | 4 ++-- app/assets/stylesheets/specific/mod_queue.scss | 2 +- app/assets/stylesheets/specific/pools.scss | 2 +- app/assets/stylesheets/specific/posts.scss | 2 +- app/assets/stylesheets/specific/related_tags.scss | 2 +- app/assets/stylesheets/specific/sessions.scss | 2 +- app/assets/stylesheets/specific/site_map.scss | 4 ++-- app/assets/stylesheets/specific/tag_subscriptions.scss | 4 ++-- app/assets/stylesheets/specific/terms_of_service.scss | 4 ++-- app/assets/stylesheets/specific/users.scss | 4 ++-- 28 files changed, 39 insertions(+), 43 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 2852b64a2..a1b69f2b0 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,5 +1,3 @@ -/* - *= require "jquery-ui-1.11.2.min.css" - *= require_tree "./common" - *= require_tree "./specific" -*/ +@import "jquery-ui-1.11.2.min.scss"; +@import "common/*"; +@import "specific/*"; diff --git a/app/assets/stylesheets/common/010_reset.scss b/app/assets/stylesheets/common/010_reset.scss index 5b5a67d35..d04218d53 100644 --- a/app/assets/stylesheets/common/010_reset.scss +++ b/app/assets/stylesheets/common/010_reset.scss @@ -1,6 +1,6 @@ // Source: https://github.com/FrogBot/sassy_bootstrap/blob/master/lib/_reset.sass -@import "000_vars.css.scss"; +@import "000_vars.scss"; // Reset.sass // Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an diff --git a/app/assets/stylesheets/common/020_base.scss b/app/assets/stylesheets/common/020_base.scss index 72d8f3141..8876fc817 100644 --- a/app/assets/stylesheets/common/020_base.scss +++ b/app/assets/stylesheets/common/020_base.scss @@ -1,4 +1,4 @@ -@import "000_vars.css.scss"; +@import "000_vars.scss"; body { background-color: #FFF; diff --git a/app/assets/stylesheets/common/030_links.scss b/app/assets/stylesheets/common/030_links.scss index 536b1b62a..87a971429 100644 --- a/app/assets/stylesheets/common/030_links.scss +++ b/app/assets/stylesheets/common/030_links.scss @@ -1,4 +1,4 @@ -@import "000_vars.css.scss"; +@import "000_vars.scss"; a:link { color: $link_color; @@ -35,4 +35,4 @@ a.forum-updated { a.wiki-link { margin-right: 0.3em; -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/common/dtext.scss b/app/assets/stylesheets/common/dtext.scss index f616f99ef..b7926ea00 100644 --- a/app/assets/stylesheets/common/dtext.scss +++ b/app/assets/stylesheets/common/dtext.scss @@ -1,4 +1,4 @@ -@import "000_vars.css.scss"; +@import "000_vars.scss"; div.prose { line-height: 1.4em; diff --git a/app/assets/stylesheets/common/inline.scss b/app/assets/stylesheets/common/inline.scss index b87e9351b..323372932 100644 --- a/app/assets/stylesheets/common/inline.scss +++ b/app/assets/stylesheets/common/inline.scss @@ -1,4 +1,4 @@ -@import "000_vars.css.scss"; +@import "000_vars.scss"; span.error { display: block; diff --git a/app/assets/stylesheets/common/main_layout.scss b/app/assets/stylesheets/common/main_layout.scss index 2872d4d1c..5271a919f 100644 --- a/app/assets/stylesheets/common/main_layout.scss +++ b/app/assets/stylesheets/common/main_layout.scss @@ -1,4 +1,4 @@ -@import "000_vars.css.scss"; +@import "000_vars.scss"; div#search { margin-bottom: 1em; diff --git a/app/assets/stylesheets/common/page_header.scss b/app/assets/stylesheets/common/page_header.scss index 060ca1249..3f2f42729 100644 --- a/app/assets/stylesheets/common/page_header.scss +++ b/app/assets/stylesheets/common/page_header.scss @@ -1,4 +1,4 @@ -@import "000_vars.css.scss"; +@import "000_vars.scss"; #maintoggle { display: none; diff --git a/app/assets/stylesheets/common/paginator.scss b/app/assets/stylesheets/common/paginator.scss index c841d9f85..8f5686590 100644 --- a/app/assets/stylesheets/common/paginator.scss +++ b/app/assets/stylesheets/common/paginator.scss @@ -1,4 +1,4 @@ -@import "000_vars.css.scss"; +@import "000_vars.scss"; div.paginator { display: block; diff --git a/app/assets/stylesheets/common/responsive.scss b/app/assets/stylesheets/common/responsive.scss index 6af9ce529..6a3ab8ae0 100644 --- a/app/assets/stylesheets/common/responsive.scss +++ b/app/assets/stylesheets/common/responsive.scss @@ -1,4 +1,4 @@ -@import "000_vars.css.scss"; +@import "000_vars.scss"; #responsive-tag-list { display: none; diff --git a/app/assets/stylesheets/common/tables.scss b/app/assets/stylesheets/common/tables.scss index 17d7e2e52..a12b55e64 100644 --- a/app/assets/stylesheets/common/tables.scss +++ b/app/assets/stylesheets/common/tables.scss @@ -1,4 +1,4 @@ -@import "000_vars.css.scss"; +@import "000_vars.scss"; table.striped { p { diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss index 7d5091d30..824b7a81d 100644 --- a/app/assets/stylesheets/mobile.scss +++ b/app/assets/stylesheets/mobile.scss @@ -1,8 +1,6 @@ -/* - *= require "./common/010_reset" - *= require "./common/020_base" - *= require "./common/030_links" -*/ +@import "common/010_reset.scss" +@import "common/020_base.scss" +@import "common/030_links.scss" body { padding: 5px; diff --git a/app/assets/stylesheets/specific/api_keys.scss b/app/assets/stylesheets/specific/api_keys.scss index 0c43e98e2..0041d0ab8 100644 --- a/app/assets/stylesheets/specific/api_keys.scss +++ b/app/assets/stylesheets/specific/api_keys.scss @@ -1,4 +1,4 @@ -@import "../common/020_base.css.scss"; +@import "../common/020_base.scss"; #c-maintenance-user-api-keys { #api-key { diff --git a/app/assets/stylesheets/specific/artists.scss b/app/assets/stylesheets/specific/artists.scss index f0d433eab..0690df638 100644 --- a/app/assets/stylesheets/specific/artists.scss +++ b/app/assets/stylesheets/specific/artists.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#c-artists, div#excerpt { span.new-artist { diff --git a/app/assets/stylesheets/specific/comments.scss b/app/assets/stylesheets/specific/comments.scss index 7eaa842bb..8f4d03fd7 100644 --- a/app/assets/stylesheets/specific/comments.scss +++ b/app/assets/stylesheets/specific/comments.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div.comments-for-post { div.notices { diff --git a/app/assets/stylesheets/specific/dmails.scss b/app/assets/stylesheets/specific/dmails.scss index de2ddb155..d2cf92815 100644 --- a/app/assets/stylesheets/specific/dmails.scss +++ b/app/assets/stylesheets/specific/dmails.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#c-dmails { div#a-show { @@ -19,4 +19,4 @@ div#c-dmails { font-size: $h2_size; } } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/specific/explore.scss b/app/assets/stylesheets/specific/explore.scss index 0e59e150d..86353235b 100644 --- a/app/assets/stylesheets/specific/explore.scss +++ b/app/assets/stylesheets/specific/explore.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#c-explore-posts { header { diff --git a/app/assets/stylesheets/specific/favorites.scss b/app/assets/stylesheets/specific/favorites.scss index f9bd890f0..13a7a7f46 100644 --- a/app/assets/stylesheets/specific/favorites.scss +++ b/app/assets/stylesheets/specific/favorites.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#c-favorites { section#content > h1 { diff --git a/app/assets/stylesheets/specific/keyboard_shortcuts.scss b/app/assets/stylesheets/specific/keyboard_shortcuts.scss index 5d649aeed..eb16070fa 100644 --- a/app/assets/stylesheets/specific/keyboard_shortcuts.scss +++ b/app/assets/stylesheets/specific/keyboard_shortcuts.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#c-static { div#a-keyboard-shortcuts { @@ -18,4 +18,4 @@ div#c-static { } } } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/specific/mod_queue.scss b/app/assets/stylesheets/specific/mod_queue.scss index 1a96ac28c..7daf2eaf8 100644 --- a/app/assets/stylesheets/specific/mod_queue.scss +++ b/app/assets/stylesheets/specific/mod_queue.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#c-moderator-post-queues { div.post { diff --git a/app/assets/stylesheets/specific/pools.scss b/app/assets/stylesheets/specific/pools.scss index 502ba112a..ed1878842 100644 --- a/app/assets/stylesheets/specific/pools.scss +++ b/app/assets/stylesheets/specific/pools.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; a.pool-category-series, .pool-category-series a { color: #A0A; diff --git a/app/assets/stylesheets/specific/posts.scss b/app/assets/stylesheets/specific/posts.scss index 6bbdc33ae..7d39d4646 100644 --- a/app/assets/stylesheets/specific/posts.scss +++ b/app/assets/stylesheets/specific/posts.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; article.post-preview { height: 154px; diff --git a/app/assets/stylesheets/specific/related_tags.scss b/app/assets/stylesheets/specific/related_tags.scss index 9ff36e6c4..141995254 100644 --- a/app/assets/stylesheets/specific/related_tags.scss +++ b/app/assets/stylesheets/specific/related_tags.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#related-tags-container { padding-right: 2em; diff --git a/app/assets/stylesheets/specific/sessions.scss b/app/assets/stylesheets/specific/sessions.scss index d43330b01..8ff8d9eb3 100644 --- a/app/assets/stylesheets/specific/sessions.scss +++ b/app/assets/stylesheets/specific/sessions.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#c-sessions { div#a-new { diff --git a/app/assets/stylesheets/specific/site_map.scss b/app/assets/stylesheets/specific/site_map.scss index 1aa0ed808..46b2f5738 100644 --- a/app/assets/stylesheets/specific/site_map.scss +++ b/app/assets/stylesheets/specific/site_map.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#c-static { div#a-site-map { @@ -22,4 +22,4 @@ div#c-static { } } } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/specific/tag_subscriptions.scss b/app/assets/stylesheets/specific/tag_subscriptions.scss index f1904ec50..9fd68c2b3 100644 --- a/app/assets/stylesheets/specific/tag_subscriptions.scss +++ b/app/assets/stylesheets/specific/tag_subscriptions.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#c-tag-subscriptions { p.info { @@ -16,4 +16,4 @@ div#c-tag-subscriptions { .hint { display: block; } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/specific/terms_of_service.scss b/app/assets/stylesheets/specific/terms_of_service.scss index 298cb81f2..42426c348 100644 --- a/app/assets/stylesheets/specific/terms_of_service.scss +++ b/app/assets/stylesheets/specific/terms_of_service.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#terms-of-service { width: 40em; @@ -23,4 +23,4 @@ div#terms-of-service { section { margin-bottom: 2em; } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/specific/users.scss b/app/assets/stylesheets/specific/users.scss index 7c19cfc03..87b3b8533 100644 --- a/app/assets/stylesheets/specific/users.scss +++ b/app/assets/stylesheets/specific/users.scss @@ -1,4 +1,4 @@ -@import "../common/000_vars.css.scss"; +@import "../common/000_vars.scss"; div#c-users { div#a-show { @@ -141,4 +141,4 @@ div#c-users { } } } -} \ No newline at end of file +}