aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Mathis <brandon@imathis.com>2013-03-11 01:40:41 -0500
committerBrandon Mathis <brandon@imathis.com>2013-03-11 01:40:41 -0500
commit9364f37ac75a028c7ce12de06cc00da5bc2506b9 (patch)
tree1a061873a16bd49869a551668528fc3a76884c84
parent05db158fec6d4c2ba3b558f2b83a0addb7f55b34 (diff)
downloadmy_new_personal_website-9364f37ac75a028c7ce12de06cc00da5bc2506b9.tar.xz
my_new_personal_website-9364f37ac75a028c7ce12de06cc00da5bc2506b9.zip
Added sass-globbing, allowing plugin stylesheets to be auto-imported from the assets/stylesheets/plugins directory
Diffstat (limited to '')
-rw-r--r--.themes/classic/sass/plugins/_plugins.scss6
-rw-r--r--.themes/classic/sass/screen.scss1
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
-rw-r--r--config.rb2
5 files changed, 13 insertions, 0 deletions
diff --git a/.themes/classic/sass/plugins/_plugins.scss b/.themes/classic/sass/plugins/_plugins.scss
new file mode 100644
index 00000000..3b4ba0b8
--- /dev/null
+++ b/.themes/classic/sass/plugins/_plugins.scss
@@ -0,0 +1,6 @@
+/*
+ Add plugin stylesheets to this directory and they will be automatically
+ Imported. Load order is alphabetical and styles can be overriden in
+ custom/_style.scss which is loaded after all plugin stylesheets.
+*/
+
diff --git a/.themes/classic/sass/screen.scss b/.themes/classic/sass/screen.scss
index 1899f608..155e81e9 100644
--- a/.themes/classic/sass/screen.scss
+++ b/.themes/classic/sass/screen.scss
@@ -7,4 +7,5 @@
@import "custom/layout";
@import "base";
@import "partials";
+@import "plugins/**/*";
@import "custom/styles";
diff --git a/Gemfile b/Gemfile
index a11c24f2..dc2b5cc6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,7 @@ group :development do
gem 'RedCloth', '~> 4.2.9'
gem 'haml', '~> 3.1.7'
gem 'compass', '~> 0.12.2'
+ gem 'sass-globbing', '~> 1.0.0'
gem 'rubypants', '~> 0.2.0'
gem 'rb-fsevent', '~> 0.9'
gem 'stringex', '~> 1.4.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index d5bc6224..02f10736 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,6 +36,8 @@ GEM
rdiscount (1.6.8)
rubypants (0.2.0)
sass (3.1.20)
+ sass-globbing (1.0.0)
+ sass (>= 3.1)
sinatra (1.3.5)
rack (~> 1.4)
rack-protection (~> 1.3)
@@ -60,5 +62,6 @@ DEPENDENCIES
rb-fsevent (~> 0.9)
rdiscount (~> 1.6.8)
rubypants (~> 0.2.0)
+ sass-globbing (~> 1.0.0)
sinatra (~> 1.3.5)
stringex (~> 1.4.0)
diff --git a/config.rb b/config.rb
index 066427ed..8cfcb51f 100644
--- a/config.rb
+++ b/config.rb
@@ -1,3 +1,5 @@
+require 'sass-globbing'
+
# Require any additional compass plugins here.
project_type = :stand_alone