Merge branch 'release/1.5.0'

flaviocopes · flaviocopes · commit 0bdbcf47f1e6 · 2016-07-14T17:56:46.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 .sass-cache
+
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v1.5.0
+## 07/14/2016
+
+1. [](#improved)
+    * Remove unneeded streams from Theme YAML
+    * Delete unused composer.json
+    * Add the `theme_config` twig var
+1. [](#bugfix)
+    * Fix missing fontawesome-webfont.woff2 file
+    * Fix slider buttons on tablet
+    * Fix setting the page language in the html tag
+    
 # v1.4.0
 ## 01/06/2016
 
diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Deliver
-version: 1.4.0
+version: 1.5.0
 description: "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme."
 icon: newspaper-o
 author:
diff --git a/composer.json b/composer.json
diff --git a/css-compiled/template.css b/css-compiled/template.css
diff --git a/css-compiled/template.css.map b/css-compiled/template.css.map
diff --git a/deliver.yaml b/deliver.yaml
@@ -1,10 +1,3 @@
 enabled: true
 dropdown:
   enabled: false
-
-streams:
-  scheme:
-    theme:
-      type: ReadOnlyStream
-      paths:
-        - user/themes/deliver
diff --git a/fonts/fontawesome-webfont.woff2 b/fonts/fontawesome-webfont.woff2
diff --git a/scss/template/modular/_showcase.scss b/scss/template/modular/_showcase.scss
@@ -86,8 +86,10 @@
         @extend .default-animation;
         position: absolute;
         display: block;
-        width: 3.7rem;
-        height: 3.7rem;
+        padding-bottom: 0;
+padding-left: 0.8rem;
+padding-right: 0.8rem;
+padding-top: 0;
         cursor: pointer;
         z-index: 50;
         text-align: center;
@@ -98,7 +100,7 @@
         font-size: 2.5rem;
         opacity: 0.5;
         color: $black;
-        @include breakpoint(mobile-only) { 
+        @include breakpoint(mobile-only) {
             font-size: 1.5rem;
             line-height: 2.8rem;
         }
@@ -116,7 +118,7 @@
              }
         }
         &:disabled {opacity: 0.1}
-        @include breakpoint(mobile-only) { 
+        @include breakpoint(mobile-only) {
             width: 2.7rem;
             height: 2.7rem;
         }
diff --git a/templates/modular.html.twig b/templates/modular.html.twig
@@ -51,7 +51,7 @@
         {% endmacro %}
 
 
-        {% if config.themes.deliver.dropdown.enabled %}
+        {% if theme_config.dropdown.enabled %}
             {{ _self.loop(pages) }}
         {% else %}
             {% for page in pages.children %}
diff --git a/templates/modular/contact.html.twig b/templates/modular/contact.html.twig
@@ -2,7 +2,7 @@
     <div class="g-grid pure-g-r">
         <div id="listing" class="g-block pure-u-2-3">
             {% if config.plugins.simple_form.enabled %}
-                {% set simple_form_config = page.header.simple_form ?: config.themes.deliver.simple_form %}
+                {% set simple_form_config = page.header.simple_form ?: theme_config.simple_form %}
                     {{ simple_form(simple_form_config) }}
                 {% endif %}
         </div>
diff --git a/templates/modular_alt.html.twig b/templates/modular_alt.html.twig
@@ -46,7 +46,7 @@
             {% endif %}
         {% endfor %}
         {% endmacro %}
-        {% if config.themes.deliver.dropdown.enabled %}
+        {% if theme_config.dropdown.enabled %}
             {{ _self.loop(pages) }}
         {% else %}
             {% for page in pages.children %}
diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig
@@ -1,5 +1,6 @@
+{% set theme_config = attribute(config.themes, config.system.pages.theme) %}
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ grav.language.getLanguage ?: 'en' }}">
 <head>
 {% block head %}
     <meta charset="utf-8" />
diff --git a/templates/partials/navigation.html.twig b/templates/partials/navigation.html.twig
@@ -18,7 +18,7 @@
 {% endmacro %}
 
 <ul class="navigation">
-    {% if config.themes.deliver.dropdown.enabled %}
+    {% if theme_config.dropdown.enabled %}
         {{ _self.loop(pages) }}
     {% else %}
         {% for page in pages.children %}
diff --git a/templates/partials/simplesearch_base.html.twig b/templates/partials/simplesearch_base.html.twig
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ grav.language.getLanguage ?: 'en' }}">
 <head>
 {% block head %}
     <meta charset="utf-8" />
