diff --git a/source/themes/opdavies/opdavies/Gemfile b/source/themes/opdavies/opdavies/Gemfile index 2b3ec0734..4b44e5c55 100644 --- a/source/themes/opdavies/opdavies/Gemfile +++ b/source/themes/opdavies/opdavies/Gemfile @@ -2,11 +2,9 @@ source 'https://rubygems.org' group :development do - 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" + gem "sass" + gem "sass-globbing" + gem "bootstrap-sass" + gem "compass" end \ No newline at end of file diff --git a/source/themes/opdavies/opdavies/Gemfile.lock b/source/themes/opdavies/opdavies/Gemfile.lock index 110e30bb1..ac2acc85a 100644 --- a/source/themes/opdavies/opdavies/Gemfile.lock +++ b/source/themes/opdavies/opdavies/Gemfile.lock @@ -1,44 +1,41 @@ GEM remote: https://rubygems.org/ specs: - breakpoint (2.4.2) - sass (~> 3.3.0) - sassy-maps (< 1.0.0) + autoprefixer-rails (5.1.8) + execjs + json + bootstrap-sass (3.3.4.1) + autoprefixer-rails (>= 5.0.0.1) + sass (>= 3.2.19) chunky_png (1.3.4) - compass (1.0.0.alpha.20) + compass (1.0.3) chunky_png (~> 1.2) - compass-core (~> 1.0.0.alpha.20) - compass-import-once (~> 1.0.4) + compass-core (~> 1.0.2) + compass-import-once (~> 1.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - sass (>= 3.3.0, < 3.5) + sass (>= 3.3.13, < 3.5) compass-core (1.0.3) multi_json (~> 1.0) sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) + execjs (2.4.0) ffi (1.9.8) + json (1.8.2) 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.3.9) + sass (3.4.13) sass-globbing (1.1.1) sass (>= 3.1) - sassy-maps (0.4.0) - sass (~> 3.3) - susy (2.1.2) - sass (~> 3.3.0) PLATFORMS ruby DEPENDENCIES - 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) + bootstrap-sass + compass + sass + sass-globbing diff --git a/source/themes/opdavies/opdavies/_layouts/default.html.twig b/source/themes/opdavies/opdavies/_layouts/default.html.twig index 6e67f1aeb..c1fc00993 100644 --- a/source/themes/opdavies/opdavies/_layouts/default.html.twig +++ b/source/themes/opdavies/opdavies/_layouts/default.html.twig @@ -2,6 +2,7 @@ + @@ -11,15 +12,15 @@ {% block styles %}{% endblock %} - {% include 'header' %} + {% include 'navbar' %} {% block content_wrapper %} -
+
{% block content %}{% endblock %}
{% endblock %} -