From 29ce68fbe81e140698328ca9f1b571074162a7d3 Mon Sep 17 00:00:00 2001 From: Giansimon Date: Tue, 21 Jun 2016 06:42:13 +0200 Subject: [PATCH] added mdi icons support fixed assets are not added for common plugins fixed gravstrap-list-item shortcode does not show the items --- CHANGELOG.md | 9 +++++++++ blueprints.yaml | 2 +- gravstrap.php | 2 +- shortcodes/Basic/ListShortcode.php | 3 ++- templates/basic/icon.html.twig | 2 ++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82dfda5..28476aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v1.1.1 +## 06/21/2016 +1.[](#improved) + * added mdi icons support + +1.[](#bugfix) + * fixed assets are not added for common plugins + * fixed gravstrap-list-item shortcode does not show the items + # v1.1.0 ## 06/12/2016 1.[](#improved) diff --git a/blueprints.yaml b/blueprints.yaml index 3dbd8e9..c86ea4f 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Gravstrap -version: 1.1.0 +version: 1.1.1 description: "Gravstrap is a Grav plugin that provides Bootstrap components as shortcodes. It has 30+ basic, modules and bootstrap shortcodes" icon: share-alt author: diff --git a/gravstrap.php b/gravstrap.php index 499555a..e6682c3 100644 --- a/gravstrap.php +++ b/gravstrap.php @@ -120,7 +120,7 @@ private function manageModularPage(Page $page) private function addAssets(Page $page) { // get the meta and check for assets - $meta = $page->getContentMeta(); + $meta = $page->getContentMeta('shortcode-meta'); if (!isset($meta['shortcode-assets'])) { return; } diff --git a/shortcodes/Basic/ListShortcode.php b/shortcodes/Basic/ListShortcode.php index df23c87..1629a19 100644 --- a/shortcodes/Basic/ListShortcode.php +++ b/shortcodes/Basic/ListShortcode.php @@ -48,7 +48,8 @@ protected function template() protected function childrenShortcodes() { return array( - 'gravstrap-list-item' + 'gravstrap-list-item', + 'g-list-item', ); } diff --git a/templates/basic/icon.html.twig b/templates/basic/icon.html.twig index a000c49..7991f78 100644 --- a/templates/basic/icon.html.twig +++ b/templates/basic/icon.html.twig @@ -5,6 +5,8 @@ {% elseif type == 'fontawesome' %} +{% elseif type == 'mdi' %} + {% else %}

{{ 'icon_type ' ~ type ~ ' is not supported'}}

{% endif %}