added mdi icons support

fixed assets are not added for common plugins fixed gravstrap-list-item shortcode does not show the items
giansi · Jun 21, 2016 · 29ce68f · 29ce68f
1 parent f0ba9ef
commit 29ce68f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -5,6 +5,8 @@
 <span class="glyphicon glyphicon-{{ icon }} {{ attributes['class'] }}" {% include 'partials/_attributes.html.twig' with {'ignore': ['class']} %}></span>
 {% elseif type == 'fontawesome' %}
 <i class="fa fa-{{ icon }} {{ attributes['class'] }}" {% include 'partials/_attributes.html.twig' with {'ignore': ['class']} %}></i>
+{% elseif type == 'mdi' %}
+<i class="mdi mdi-{{ icon }} {{ attributes['class'] }}" {% include 'partials/_attributes.html.twig' with {'ignore': ['class']} %}></i>
 {% else %}
 <p>{{ 'icon_type ' ~ type ~ ' is not supported'}}</p>
 {% endif %}