From 735d43b650d2ea99a0c0fe6a152e99810bde4c3b Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 19 Mar 2015 15:15:13 +0000 Subject: [PATCH] Theme updates --- source/themes/opdavies/opdavies/Gemfile | 10 +- source/themes/opdavies/opdavies/Gemfile.lock | 31 ++-- .../opdavies/_layouts/default.html.twig | 5 +- .../opdavies/_partials/header.html.twig | 6 +- .../opdavies/_partials/main-menu.html.twig | 16 +- .../opdavies/opdavies/assets/css/styles.css | 173 +++++++++++++++++- .../opdavies/assets/scss/layout/_grid.scss | 5 + .../assets/scss/modules/_content.scss | 18 ++ .../opdavies/assets/scss/modules/_header.scss | 34 ++++ .../opdavies/opdavies/assets/scss/styles.scss | 44 ++++- .../assets/scss/variables/_layout.scss | 0 .../assets/scss/variables/_legacy.scss | 4 + source/themes/opdavies/opdavies/config.rb | 3 - 13 files changed, 318 insertions(+), 31 deletions(-) create mode 100644 source/themes/opdavies/opdavies/assets/scss/layout/_grid.scss create mode 100644 source/themes/opdavies/opdavies/assets/scss/modules/_content.scss create mode 100644 source/themes/opdavies/opdavies/assets/scss/modules/_header.scss create mode 100644 source/themes/opdavies/opdavies/assets/scss/variables/_layout.scss create mode 100644 source/themes/opdavies/opdavies/assets/scss/variables/_legacy.scss diff --git a/source/themes/opdavies/opdavies/Gemfile b/source/themes/opdavies/opdavies/Gemfile index 4a2b383f4..2b3ec0734 100644 --- a/source/themes/opdavies/opdavies/Gemfile +++ b/source/themes/opdavies/opdavies/Gemfile @@ -2,9 +2,11 @@ source 'https://rubygems.org' group :development do - gem 'sass' - gem 'sass-globbing' - gem 'compass' - gem 'susy' + gem "sass", "3.3.9" + gem "sass-globbing", "1.1.1" + gem "compass", "1.0.0.alpha.20" + gem "susy", "2.1.2" + gem "breakpoint", "2.4.2" + gem "oily_png" end \ No newline at end of file diff --git a/source/themes/opdavies/opdavies/Gemfile.lock b/source/themes/opdavies/opdavies/Gemfile.lock index cd63af9d4..110e30bb1 100644 --- a/source/themes/opdavies/opdavies/Gemfile.lock +++ b/source/themes/opdavies/opdavies/Gemfile.lock @@ -1,14 +1,17 @@ GEM remote: https://rubygems.org/ specs: + breakpoint (2.4.2) + sass (~> 3.3.0) + sassy-maps (< 1.0.0) chunky_png (1.3.4) - compass (1.0.3) + compass (1.0.0.alpha.20) chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) + compass-core (~> 1.0.0.alpha.20) + compass-import-once (~> 1.0.4) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) + sass (>= 3.3.0, < 3.5) compass-core (1.0.3) multi_json (~> 1.0) sass (>= 3.3.0, < 3.5) @@ -16,20 +19,26 @@ GEM sass (>= 3.2, < 3.5) ffi (1.9.8) multi_json (1.11.0) + oily_png (1.1.2) + chunky_png (~> 1.3.1) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) - sass (3.4.13) + sass (3.3.9) sass-globbing (1.1.1) sass (>= 3.1) - susy (2.2.2) - sass (>= 3.3.0, < 3.5) + sassy-maps (0.4.0) + sass (~> 3.3) + susy (2.1.2) + sass (~> 3.3.0) PLATFORMS ruby DEPENDENCIES - compass - sass - sass-globbing - susy + breakpoint (= 2.4.2) + compass (= 1.0.0.alpha.20) + oily_png + sass (= 3.3.9) + sass-globbing (= 1.1.1) + susy (= 2.1.2) diff --git a/source/themes/opdavies/opdavies/_layouts/default.html.twig b/source/themes/opdavies/opdavies/_layouts/default.html.twig index b0b930e81..40a17e694 100644 --- a/source/themes/opdavies/opdavies/_layouts/default.html.twig +++ b/source/themes/opdavies/opdavies/_layouts/default.html.twig @@ -10,8 +10,11 @@ {% include 'header' %} + {% block content_wrapper %} - {% block content %}{% endblock %} +
+ {% block content %}{% endblock %} +
{% endblock %} {% include 'footer-scripts' %} diff --git a/source/themes/opdavies/opdavies/_partials/header.html.twig b/source/themes/opdavies/opdavies/_partials/header.html.twig index 6569cc834..2beed871c 100644 --- a/source/themes/opdavies/opdavies/_partials/header.html.twig +++ b/source/themes/opdavies/opdavies/_partials/header.html.twig @@ -1,4 +1,6 @@
- {{ site.title }} - {% include 'main-menu' %} +
+
{{ site.title }}
+ {% include 'main-menu' %} +
{# .inner #}
\ No newline at end of file diff --git a/source/themes/opdavies/opdavies/_partials/main-menu.html.twig b/source/themes/opdavies/opdavies/_partials/main-menu.html.twig index dbaaf5027..1dca706c4 100644 --- a/source/themes/opdavies/opdavies/_partials/main-menu.html.twig +++ b/source/themes/opdavies/opdavies/_partials/main-menu.html.twig @@ -1,8 +1,10 @@ -