From f20fba6dbf2b0bb136554a9e77b21012f749c61f Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 25 May 2015 10:13:17 +0100 Subject: [PATCH] Moved everything out of the theme --- app/config/sculpin_kernel.yml | 2 -- .../opdavies/opdavies => }/_layouts/default.html.twig | 0 .../opdavies/opdavies => }/_layouts/post.html.twig | 0 .../opdavies/opdavies => }/_layouts/project.html.twig | 0 .../opdavies/opdavies => }/_layouts/talk.html.twig | 0 .../opdavies => }/_partials/about-author.html.twig | 0 .../opdavies => }/_partials/footer-scripts.html.twig | 0 .../opdavies => }/_partials/latest-posts.html.twig | 0 .../opdavies/opdavies => }/_partials/navbar.html.twig | 0 .../{themes/opdavies/opdavies => }/_partials/og.html.twig | 0 .../opdavies => }/_partials/post-header.html.twig | 0 .../opdavies => }/_partials/talk-listing-item.html.twig | 0 .../opdavies/opdavies => }/_partials/title.html.twig | 0 source/{themes/opdavies/opdavies => assets}/Gemfile | 0 source/{themes/opdavies/opdavies => assets}/Gemfile.lock | 0 source/{themes/opdavies/opdavies => assets}/config.rb | 8 ++++---- .../{themes/opdavies/opdavies => }/assets/css/styles.css | 0 .../opdavies/opdavies => }/assets/js/bootstrap.min.js | 0 .../opdavies/opdavies => }/assets/sass/base/_base.scss | 0 .../opdavies/opdavies => }/assets/sass/base/_lists.scss | 0 .../opdavies/opdavies => }/assets/sass/base/_tables.scss | 0 .../opdavies => }/assets/sass/components/_footer.scss | 0 .../assets/sass/components/_latest-posts.scss | 0 source/assets/sass/components/_navbar.scss | 0 .../opdavies/opdavies => }/assets/sass/styles.scss | 0 .../opdavies => }/assets/sass/variables/_colours.scss | 0 .../opdavies => }/assets/sass/variables/_typography.scss | 0 27 files changed, 4 insertions(+), 6 deletions(-) rename source/{themes/opdavies/opdavies => }/_layouts/default.html.twig (100%) rename source/{themes/opdavies/opdavies => }/_layouts/post.html.twig (100%) rename source/{themes/opdavies/opdavies => }/_layouts/project.html.twig (100%) rename source/{themes/opdavies/opdavies => }/_layouts/talk.html.twig (100%) rename source/{themes/opdavies/opdavies => }/_partials/about-author.html.twig (100%) rename source/{themes/opdavies/opdavies => }/_partials/footer-scripts.html.twig (100%) rename source/{themes/opdavies/opdavies => }/_partials/latest-posts.html.twig (100%) rename source/{themes/opdavies/opdavies => }/_partials/navbar.html.twig (100%) rename source/{themes/opdavies/opdavies => }/_partials/og.html.twig (100%) rename source/{themes/opdavies/opdavies => }/_partials/post-header.html.twig (100%) rename source/{themes/opdavies/opdavies => }/_partials/talk-listing-item.html.twig (100%) rename source/{themes/opdavies/opdavies => }/_partials/title.html.twig (100%) rename source/{themes/opdavies/opdavies => assets}/Gemfile (100%) rename source/{themes/opdavies/opdavies => assets}/Gemfile.lock (100%) rename source/{themes/opdavies/opdavies => assets}/config.rb (90%) rename source/{themes/opdavies/opdavies => }/assets/css/styles.css (100%) rename source/{themes/opdavies/opdavies => }/assets/js/bootstrap.min.js (100%) rename source/{themes/opdavies/opdavies => }/assets/sass/base/_base.scss (100%) rename source/{themes/opdavies/opdavies => }/assets/sass/base/_lists.scss (100%) rename source/{themes/opdavies/opdavies => }/assets/sass/base/_tables.scss (100%) rename source/{themes/opdavies/opdavies => }/assets/sass/components/_footer.scss (100%) rename source/{themes/opdavies/opdavies => }/assets/sass/components/_latest-posts.scss (100%) create mode 100644 source/assets/sass/components/_navbar.scss rename source/{themes/opdavies/opdavies => }/assets/sass/styles.scss (100%) rename source/{themes/opdavies/opdavies => }/assets/sass/variables/_colours.scss (100%) rename source/{themes/opdavies/opdavies => }/assets/sass/variables/_typography.scss (100%) diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index facbf674..d09d91cd 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -13,5 +13,3 @@ sculpin_content_types: permalink: talks/:year/:month/:day/:slug_title/ taxonomies: - tags -sculpin_theme: - theme: opdavies/opdavies diff --git a/source/themes/opdavies/opdavies/_layouts/default.html.twig b/source/_layouts/default.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_layouts/default.html.twig rename to source/_layouts/default.html.twig diff --git a/source/themes/opdavies/opdavies/_layouts/post.html.twig b/source/_layouts/post.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_layouts/post.html.twig rename to source/_layouts/post.html.twig diff --git a/source/themes/opdavies/opdavies/_layouts/project.html.twig b/source/_layouts/project.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_layouts/project.html.twig rename to source/_layouts/project.html.twig diff --git a/source/themes/opdavies/opdavies/_layouts/talk.html.twig b/source/_layouts/talk.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_layouts/talk.html.twig rename to source/_layouts/talk.html.twig diff --git a/source/themes/opdavies/opdavies/_partials/about-author.html.twig b/source/_partials/about-author.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_partials/about-author.html.twig rename to source/_partials/about-author.html.twig diff --git a/source/themes/opdavies/opdavies/_partials/footer-scripts.html.twig b/source/_partials/footer-scripts.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_partials/footer-scripts.html.twig rename to source/_partials/footer-scripts.html.twig diff --git a/source/themes/opdavies/opdavies/_partials/latest-posts.html.twig b/source/_partials/latest-posts.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_partials/latest-posts.html.twig rename to source/_partials/latest-posts.html.twig diff --git a/source/themes/opdavies/opdavies/_partials/navbar.html.twig b/source/_partials/navbar.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_partials/navbar.html.twig rename to source/_partials/navbar.html.twig diff --git a/source/themes/opdavies/opdavies/_partials/og.html.twig b/source/_partials/og.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_partials/og.html.twig rename to source/_partials/og.html.twig diff --git a/source/themes/opdavies/opdavies/_partials/post-header.html.twig b/source/_partials/post-header.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_partials/post-header.html.twig rename to source/_partials/post-header.html.twig diff --git a/source/themes/opdavies/opdavies/_partials/talk-listing-item.html.twig b/source/_partials/talk-listing-item.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_partials/talk-listing-item.html.twig rename to source/_partials/talk-listing-item.html.twig diff --git a/source/themes/opdavies/opdavies/_partials/title.html.twig b/source/_partials/title.html.twig similarity index 100% rename from source/themes/opdavies/opdavies/_partials/title.html.twig rename to source/_partials/title.html.twig diff --git a/source/themes/opdavies/opdavies/Gemfile b/source/assets/Gemfile similarity index 100% rename from source/themes/opdavies/opdavies/Gemfile rename to source/assets/Gemfile diff --git a/source/themes/opdavies/opdavies/Gemfile.lock b/source/assets/Gemfile.lock similarity index 100% rename from source/themes/opdavies/opdavies/Gemfile.lock rename to source/assets/Gemfile.lock diff --git a/source/themes/opdavies/opdavies/config.rb b/source/assets/config.rb similarity index 90% rename from source/themes/opdavies/opdavies/config.rb rename to source/assets/config.rb index 8c65c1fd..13330f54 100644 --- a/source/themes/opdavies/opdavies/config.rb +++ b/source/assets/config.rb @@ -7,11 +7,11 @@ ## # Location of the theme's resources. -css_dir = "assets/css" -sass_dir = "assets/sass" -images_dir = "assets/images" +css_dir = "css" +sass_dir = "sass" +images_dir = "images" generated_images_dir = images_dir + "/generated" -javascripts_dir = "assets/js" +javascripts_dir = "js" # Require any additional compass plugins installed on your system. require 'sass-globbing' diff --git a/source/themes/opdavies/opdavies/assets/css/styles.css b/source/assets/css/styles.css similarity index 100% rename from source/themes/opdavies/opdavies/assets/css/styles.css rename to source/assets/css/styles.css diff --git a/source/themes/opdavies/opdavies/assets/js/bootstrap.min.js b/source/assets/js/bootstrap.min.js similarity index 100% rename from source/themes/opdavies/opdavies/assets/js/bootstrap.min.js rename to source/assets/js/bootstrap.min.js diff --git a/source/themes/opdavies/opdavies/assets/sass/base/_base.scss b/source/assets/sass/base/_base.scss similarity index 100% rename from source/themes/opdavies/opdavies/assets/sass/base/_base.scss rename to source/assets/sass/base/_base.scss diff --git a/source/themes/opdavies/opdavies/assets/sass/base/_lists.scss b/source/assets/sass/base/_lists.scss similarity index 100% rename from source/themes/opdavies/opdavies/assets/sass/base/_lists.scss rename to source/assets/sass/base/_lists.scss diff --git a/source/themes/opdavies/opdavies/assets/sass/base/_tables.scss b/source/assets/sass/base/_tables.scss similarity index 100% rename from source/themes/opdavies/opdavies/assets/sass/base/_tables.scss rename to source/assets/sass/base/_tables.scss diff --git a/source/themes/opdavies/opdavies/assets/sass/components/_footer.scss b/source/assets/sass/components/_footer.scss similarity index 100% rename from source/themes/opdavies/opdavies/assets/sass/components/_footer.scss rename to source/assets/sass/components/_footer.scss diff --git a/source/themes/opdavies/opdavies/assets/sass/components/_latest-posts.scss b/source/assets/sass/components/_latest-posts.scss similarity index 100% rename from source/themes/opdavies/opdavies/assets/sass/components/_latest-posts.scss rename to source/assets/sass/components/_latest-posts.scss diff --git a/source/assets/sass/components/_navbar.scss b/source/assets/sass/components/_navbar.scss new file mode 100644 index 00000000..e69de29b diff --git a/source/themes/opdavies/opdavies/assets/sass/styles.scss b/source/assets/sass/styles.scss similarity index 100% rename from source/themes/opdavies/opdavies/assets/sass/styles.scss rename to source/assets/sass/styles.scss diff --git a/source/themes/opdavies/opdavies/assets/sass/variables/_colours.scss b/source/assets/sass/variables/_colours.scss similarity index 100% rename from source/themes/opdavies/opdavies/assets/sass/variables/_colours.scss rename to source/assets/sass/variables/_colours.scss diff --git a/source/themes/opdavies/opdavies/assets/sass/variables/_typography.scss b/source/assets/sass/variables/_typography.scss similarity index 100% rename from source/themes/opdavies/opdavies/assets/sass/variables/_typography.scss rename to source/assets/sass/variables/_typography.scss