Merge branch 'release/2.0.3'

getgrav · Jun 8, 2020 · e1ef3fb · e1ef3fb
2 parents 3a832dc + c7d6300
commit e1ef3fb
Show file tree

Hide file tree

Showing 6 changed files with 916 additions and 712 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,18 @@
+# v2.0.3
+## 06/08/2020
+
+1. [](#improved)
+ * Updated some JS libraries
+ * Simplified navigation macro
+ * Use `site.title` in logo alt text [#139](https://github.com/getgrav/grav-theme-quark/pull/109)
+
 # v2.0.2
 ## 08/09/2019
 
 1. [](#improved)
  * Allow for overriding of `{% block content %}{% endblock %}`
  * Improved default `.table` styling
+ * Simplified navigation macro
 1. [](#bugfix)
  * Fixed issue with Prism Highlight [prism-highlight#1](https://github.com/trilbymedia/grav-plugin-prism-highlight/issues/1)
  * Use slug for onpage links [#115](https://github.com/getgrav/grav-theme-quark/issues/115)

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,7 @@
 name: Quark
-version: 2.0.2
+slug: quark
+type: theme
+version: 2.0.3
 description: New Grav Default Theme
 icon: microchip
 author:

diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
  },
  "devDependencies": {
  "gulp": "^4.0.0",
- "gulp-autoprefixer": "latest",
+ "gulp-autoprefixer": "^6.1.0",
  "gulp-clean-css": "^3.9.4",
  "gulp-csscomb": "^3.0.8",
  "gulp-rename": "^1.2.2",

diff --git a/templates/macros/macros.html.twig b/templates/macros/macros.html.twig
@@ -2,21 +2,15 @@
  {% import _self as macros %}
  {% for p in page.children.visible %}
  {% set active_page = (p.active or p.activeChild) ? 'active' : '' %}
- {% if p.children.visible.count > 0 %}
- <li>
- <a href="{{ p.url }}" class="{{ active_page }}">
- {{ p.menu }}
- </a>
- <ul>
- {{ macros.nav_loop(p) }}
- </ul>
- </li>
- {% else %}
- <li>
- <a href="{{ p.url }}" class="{{ active_page }}">
- {{ p.menu }}
- </a>
- </li>
- {% endif %}
+ <li>
+ <a href="{{ p.url }}" class="{{ active_page }}">
+ {{ p.menu }}
+ </a>
+ {% if p.children.visible.count > 0 %}
+ <ul>
+ {{ macros.nav_loop(p) }}
+ </ul>
+ {% endif %}
+ </li>
  {% endfor %}
-{% endmacro %}
+{% endmacro %}
diff --git a/templates/partials/logo.html.twig b/templates/partials/logo.html.twig
@@ -2,7 +2,7 @@
 <a href="{{ home_url }}" class="navbar-brand mr-10">
 {% if logo %}
  {% set logo_file = (logo|first).name %}
- <img src="{{ url('theme://images/logo/' ~ logo_file) }}" alt="{{ site.name }}" />
+ <img src="{{ url('theme://images/logo/' ~ logo_file) }}" alt="{{ site.title }}" />
 {% else %}
  {% include('@images/grav-logo.svg') %}
 {% endif %}