From bdd6c251fc6da62c683c71a23ac8b8109881b666 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 31 Aug 2015 19:57:37 +0100
Subject: [PATCH] Moved theme files

---
 app/config/sculpin_kernel.yml                          | 10 ++++++++++
 Gemfile => source/themes/opdavies/oliverdavies/Gemfile |  0
 .../themes/opdavies/oliverdavies/Gemfile.lock          |  0
 .../themes/opdavies/oliverdavies/_layouts/default.twig |  3 +--
 .../themes/opdavies/oliverdavies/config.rb             |  7 +++----
 .../opdavies/oliverdavies}/css/styles.css              |  0
 .../themes/opdavies/oliverdavies/sass}/base/_base.scss |  0
 .../opdavies/oliverdavies/sass}/base/_lists.scss       |  0
 .../opdavies/oliverdavies/sass}/base/_tables.scss      |  0
 .../oliverdavies/sass}/components/_about-author.scss   |  0
 .../oliverdavies/sass}/components/_footer.scss         |  0
 .../oliverdavies/sass}/components/_latest-posts.scss   |  0
 .../oliverdavies/sass}/components/_navbar.scss         |  0
 .../sass}/components/blocks/_drupalcon-la.scss         |  0
 .../oliverdavies/sass}/components/blocks/_meetups.scss |  0
 .../sass}/components/pages/_blog-listing.scss          |  0
 .../sass}/components/pages/_testimonials.scss          |  0
 .../themes/opdavies/oliverdavies/sass}/styles.scss     |  0
 .../oliverdavies/sass}/variables/_colours.scss         |  0
 .../oliverdavies/sass}/variables/_typography.scss      |  0
 20 files changed, 14 insertions(+), 6 deletions(-)
 rename Gemfile => source/themes/opdavies/oliverdavies/Gemfile (100%)
 rename Gemfile.lock => source/themes/opdavies/oliverdavies/Gemfile.lock (100%)
 rename config.rb => source/themes/opdavies/oliverdavies/config.rb (88%)
 rename source/{assets => themes/opdavies/oliverdavies}/css/styles.css (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/base/_base.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/base/_lists.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/base/_tables.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/components/_about-author.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/components/_footer.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/components/_latest-posts.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/components/_navbar.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/components/blocks/_drupalcon-la.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/components/blocks/_meetups.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/components/pages/_blog-listing.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/components/pages/_testimonials.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/styles.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/variables/_colours.scss (100%)
 rename {sass => source/themes/opdavies/oliverdavies/sass}/variables/_typography.scss (100%)

diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml
index 2ab79060..2882b4dd 100644
--- a/app/config/sculpin_kernel.yml
+++ b/app/config/sculpin_kernel.yml
@@ -1,5 +1,15 @@
+sculpin:
+    ignore:
+        - "**/*.scss"
+        - "**/.sass-cache"
+        - "**/config.rb"
+        - "**/Gemfile*"
+
 sculpin_content_types:
     posts:
         permalink: blog/:slug_title/
         taxonomies:
             - tags
+
+sculpin_theme:
+    theme: opdavies/oliverdavies
diff --git a/Gemfile b/source/themes/opdavies/oliverdavies/Gemfile
similarity index 100%
rename from Gemfile
rename to source/themes/opdavies/oliverdavies/Gemfile
diff --git a/Gemfile.lock b/source/themes/opdavies/oliverdavies/Gemfile.lock
similarity index 100%
rename from Gemfile.lock
rename to source/themes/opdavies/oliverdavies/Gemfile.lock
diff --git a/source/themes/opdavies/oliverdavies/_layouts/default.twig b/source/themes/opdavies/oliverdavies/_layouts/default.twig
index a7416426..9cc040dc 100644
--- a/source/themes/opdavies/oliverdavies/_layouts/default.twig
+++ b/source/themes/opdavies/oliverdavies/_layouts/default.twig
@@ -17,8 +17,7 @@
         <meta lang="en-GB" charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="author" href="{{ site.url }}/humans.txt" />
-        <link rel="stylesheet" href="{{ site.url }}/assets/css/styles.css">
+        <link rel="stylesheet" href="{{ site.url }}/{{ theme_path('css/styles.css') }}">
         <link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css">
 
         {% for size in site.apple_touch_icon_sizes %}
diff --git a/config.rb b/source/themes/opdavies/oliverdavies/config.rb
similarity index 88%
rename from config.rb
rename to source/themes/opdavies/oliverdavies/config.rb
index cdae5114..c1a766c8 100644
--- a/config.rb
+++ b/source/themes/opdavies/oliverdavies/config.rb
@@ -8,11 +8,10 @@
 
 # Location of the theme's resources.
 sass_dir = "sass"
-assets_dir = "source/assets"
-css_dir = assets_dir + "/css"
-images_dir = assets_dir + "/images"
+css_dir = "css"
+images_dir = "images"
 generated_images_dir = images_dir + "/generated"
-javascripts_dir = assets_dir + "/js"
+javascripts_dir = "js"
 
 # Require any additional compass plugins installed on your system.
 require 'sass-globbing'
diff --git a/source/assets/css/styles.css b/source/themes/opdavies/oliverdavies/css/styles.css
similarity index 100%
rename from source/assets/css/styles.css
rename to source/themes/opdavies/oliverdavies/css/styles.css
diff --git a/sass/base/_base.scss b/source/themes/opdavies/oliverdavies/sass/base/_base.scss
similarity index 100%
rename from sass/base/_base.scss
rename to source/themes/opdavies/oliverdavies/sass/base/_base.scss
diff --git a/sass/base/_lists.scss b/source/themes/opdavies/oliverdavies/sass/base/_lists.scss
similarity index 100%
rename from sass/base/_lists.scss
rename to source/themes/opdavies/oliverdavies/sass/base/_lists.scss
diff --git a/sass/base/_tables.scss b/source/themes/opdavies/oliverdavies/sass/base/_tables.scss
similarity index 100%
rename from sass/base/_tables.scss
rename to source/themes/opdavies/oliverdavies/sass/base/_tables.scss
diff --git a/sass/components/_about-author.scss b/source/themes/opdavies/oliverdavies/sass/components/_about-author.scss
similarity index 100%
rename from sass/components/_about-author.scss
rename to source/themes/opdavies/oliverdavies/sass/components/_about-author.scss
diff --git a/sass/components/_footer.scss b/source/themes/opdavies/oliverdavies/sass/components/_footer.scss
similarity index 100%
rename from sass/components/_footer.scss
rename to source/themes/opdavies/oliverdavies/sass/components/_footer.scss
diff --git a/sass/components/_latest-posts.scss b/source/themes/opdavies/oliverdavies/sass/components/_latest-posts.scss
similarity index 100%
rename from sass/components/_latest-posts.scss
rename to source/themes/opdavies/oliverdavies/sass/components/_latest-posts.scss
diff --git a/sass/components/_navbar.scss b/source/themes/opdavies/oliverdavies/sass/components/_navbar.scss
similarity index 100%
rename from sass/components/_navbar.scss
rename to source/themes/opdavies/oliverdavies/sass/components/_navbar.scss
diff --git a/sass/components/blocks/_drupalcon-la.scss b/source/themes/opdavies/oliverdavies/sass/components/blocks/_drupalcon-la.scss
similarity index 100%
rename from sass/components/blocks/_drupalcon-la.scss
rename to source/themes/opdavies/oliverdavies/sass/components/blocks/_drupalcon-la.scss
diff --git a/sass/components/blocks/_meetups.scss b/source/themes/opdavies/oliverdavies/sass/components/blocks/_meetups.scss
similarity index 100%
rename from sass/components/blocks/_meetups.scss
rename to source/themes/opdavies/oliverdavies/sass/components/blocks/_meetups.scss
diff --git a/sass/components/pages/_blog-listing.scss b/source/themes/opdavies/oliverdavies/sass/components/pages/_blog-listing.scss
similarity index 100%
rename from sass/components/pages/_blog-listing.scss
rename to source/themes/opdavies/oliverdavies/sass/components/pages/_blog-listing.scss
diff --git a/sass/components/pages/_testimonials.scss b/source/themes/opdavies/oliverdavies/sass/components/pages/_testimonials.scss
similarity index 100%
rename from sass/components/pages/_testimonials.scss
rename to source/themes/opdavies/oliverdavies/sass/components/pages/_testimonials.scss
diff --git a/sass/styles.scss b/source/themes/opdavies/oliverdavies/sass/styles.scss
similarity index 100%
rename from sass/styles.scss
rename to source/themes/opdavies/oliverdavies/sass/styles.scss
diff --git a/sass/variables/_colours.scss b/source/themes/opdavies/oliverdavies/sass/variables/_colours.scss
similarity index 100%
rename from sass/variables/_colours.scss
rename to source/themes/opdavies/oliverdavies/sass/variables/_colours.scss
diff --git a/sass/variables/_typography.scss b/source/themes/opdavies/oliverdavies/sass/variables/_typography.scss
similarity index 100%
rename from sass/variables/_typography.scss
rename to source/themes/opdavies/oliverdavies/sass/variables/_typography.scss