From f808e17e66348b2943b0c1da1b8fd409aa0fb937 Mon Sep 17 00:00:00 2001
From: sqndr <sqndr@2516272.no-reply.drupal.org>
Date: Tue, 22 Apr 2014 21:37:18 +0000
Subject: [PATCH] #2226475 Remove all import in favour of sass-globbing
---
Gemfile | 3 +-
Gemfile.lock | 3 ++
config.rb | 1 +
sass/partials/common/_common.scss | 38 -----------------------
sass/partials/drupalorg/_drupalorg.scss | 36 ----------------------
sass/partials/utilities/_utilities.scss | 41 -------------------------
sass/styles.scss | 23 ++++++++++++--
7 files changed, 26 insertions(+), 119 deletions(-)
delete mode 100644 sass/partials/common/_common.scss
delete mode 100644 sass/partials/drupalorg/_drupalorg.scss
delete mode 100644 sass/partials/utilities/_utilities.scss
diff --git a/Gemfile b/Gemfile
index 8697b7a2..e7bcf37c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,5 +7,6 @@ group :development do
gem 'compass' # Framework built on Sass.
gem 'susy' # Susy grid framework.
gem 'breakpoint' # Manages CSS media queries.
-
+ gem 'sass-globbing' # Allows you to import many sass or scss files
+ # in a single import statement.
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b3e2082..0cd1c90c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,6 +11,8 @@ GEM
sass (~> 3.1)
fssm (0.2.10)
sass (3.2.9)
+ sass-globbing (1.1.0)
+ sass (>= 3.1)
susy (1.0.9)
compass (>= 0.12.2)
sass (>= 3.2.0)
@@ -22,4 +24,5 @@ DEPENDENCIES
breakpoint
compass
sass
+ sass-globbing
susy
diff --git a/config.rb b/config.rb
index 48b57a70..0eadf8b1 100644
--- a/config.rb
+++ b/config.rb
@@ -5,6 +5,7 @@ end
# Require any additional compass plugins here.
require 'susy'
require 'breakpoint'
+require 'sass-globbing'
# Set this to the root of your project when deployed:
http_path = "/sites/all/themes/bluecheese/"
diff --git a/sass/partials/common/_common.scss b/sass/partials/common/_common.scss
deleted file mode 100644
index 18d8ecc8..00000000
--- a/sass/partials/common/_common.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-////////////////////////
-// Common Styles Partial
-//
-// Common styles for all *.drupal.org sites.
-// Drupal.org specific styles should be under Drupal.org partial
-////////////////////////
-
-@import 'api';
-@import 'autocomplete';
-@import 'basic-elements';
-@import 'block';
-@import 'book';
-@import 'buttons';
-@import 'comment';
-@import 'content';
-@import 'footer';
-@import 'forms';
-@import 'global';
-@import 'header';
-@import 'jquery';
-@import 'lists';
-@import 'messages';
-@import 'narrow-box';
-@import 'navigation';
-@import 'node';
-@import 'page';
-@import 'pager';
-@import 'search';
-@import 'search-advanced';
-@import 'search-help';
-@import 'search-results';
-@import 'site-status';
-@import 'sprites';
-@import 'table';
-@import 'tabs';
-@import 'tags';
-@import 'taxonomy';
-@import 'user-profile';
diff --git a/sass/partials/drupalorg/_drupalorg.scss b/sass/partials/drupalorg/_drupalorg.scss
deleted file mode 100644
index 8ecaa5b1..00000000
--- a/sass/partials/drupalorg/_drupalorg.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-////////////////////////
-// Drupal.org Styles Partial
-//
-// Drupal.org specific styles.
-// Styles used on multiple sections/sites should be under Common partial
-////////////////////////
-
-@import 'about';
-@import 'ads';
-@import 'book-listing';
-@import 'casestudies';
-@import 'community';
-@import 'dashboard';
-@import 'documentation';
-@import 'download';
-@import 'features';
-@import 'forums';
-@import 'front';
-@import 'front-tabs';
-@import 'getting-involved';
-@import 'getting-started';
-@import 'git';
-@import 'issue-comments';
-@import 'issue-mine';
-@import 'issue-page';
-@import 'issue-queue';
-@import 'maps';
-@import 'marketplace';
-@import 'member-directory';
-@import 'news';
-@import 'planet';
-@import 'project-listing';
-@import 'project-listing-search';
-@import 'project-page';
-@import 'project-page-sidebar';
-@import 'association';
diff --git a/sass/partials/utilities/_utilities.scss b/sass/partials/utilities/_utilities.scss
deleted file mode 100644
index f82f7af0..00000000
--- a/sass/partials/utilities/_utilities.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Files with extension .css are derived from .scss files. Do not edit .css
- * files directly! The .scss files can be found in the sass directory, and
- * are compiled with compass. See http://drupal.org/node/1751078 for more
- * information.
- */
-
-////////////////////////
-// Utilities Partial
-//
-// This should contain helper functions, mixins, and variables.
-// There should be no element styling here
-////////////////////////
-
-////////////////////////
-// Compass Imports
-////////////////////////
-@import 'compass';
-@import 'compass/reset';
-@import 'compass/utilities/general/clearfix';
-@import 'compass/typography/text/replacement';
-@import 'compass/css3';
-
-////////////////////////
-// Extension Imports
-////////////////////////
-@import 'susy';
-@import 'breakpoint';
-
-////////////////////////
-// Local Imports
-////////////////////////
-@import 'variables';
-@import 'mixins';
-@import 'extendables';
-//@import 'debug';
-
-////////////////////////
-// Cheating at CSS
-////////////////////////
-* {@include box-sizing('border-box');}
diff --git a/sass/styles.scss b/sass/styles.scss
index bb347c20..980d3eea 100644
--- a/sass/styles.scss
+++ b/sass/styles.scss
@@ -1,14 +1,31 @@
+////////////////////////
+// Compass Imports
+////////////////////////
+@import 'compass';
+@import 'compass/reset';
+@import 'compass/utilities/general/clearfix';
+@import 'compass/typography/text/replacement';
+@import 'compass/css3';
+@import 'susy';
+@import 'breakpoint';
+
+////////////////////////
+// Cheating at CSS
+////////////////////////
+* {@include box-sizing('border-box');}
+
+
//////////////////////////////
// Import Utilities
//////////////////////////////
-@import 'partials/utilities/utilities';
+@import 'partials/utilities/**/*';
//////////////////////////////
// Import Common Styles
//////////////////////////////
-@import 'partials/common/common';
+@import 'partials/common/**/*';
//////////////////////////////
// Import Drupal.org Styles
//////////////////////////////
-@import 'partials/drupalorg/drupalorg';
+@import 'partials/drupalorg/**/*';
--
GitLab