Merge pull request #6 from atolye15/bugfixes

Bug fixes
atolye15 · Aug 14, 2020 · 39b6584 · 39b6584
2 parents 3147b1c + 6c01214
commit 39b6584
Show file tree

Hide file tree

Showing 5 changed files with 159 additions and 97 deletions.
diff --git a/extend/kssIcons.js b/extend/kssIcons.js
@@ -44,17 +44,17 @@ module.exports = function(Twig) {
         });
 
         iconNames.forEach(item => {
-          var innerContext = Twig.ChildContext(context);
+          var innerContext =  {...context};
           innerContext.icon = {};
           innerContext.icon.name = item;
 
-          output.push(Twig.parse.apply(this, [token.output, innerContext]));
+          output.push(this.parse(token.output, innerContext));
           Twig.merge(context, innerContext, true);
         });
 
         return {
           chain: chain,
-          output: Twig.output.apply(this, [output]),
+          output: output.join(''),
         };
       },
     });

diff --git a/kss-assets/kss.css b/kss-assets/kss.css
diff --git a/kss-assets/kss.scss b/kss-assets/kss.scss
@@ -827,8 +827,6 @@ $kss-vertical-rhythm: $kss-font-size * 1.5;
   .kss-icons__name {
     display: block;
     overflow: hidden;
-    margin-left: auto;
-    margin-right: auto;
     text-overflow: ellipsis;
     white-space: nowrap;
   }

diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@atolye15/kss-node-twig-builder",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "The Twig.js builder for kss-node that used by Atölye15.",
   "main": "builder.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "sass": "./node_modules/.bin/node-sass --output-style compressed kss-assets/kss.scss kss-assets/kss.css"
   },
   "devDependencies": {
-    "node-sass": "^4.13.0",
-    "highlight.js": "^9.12.0"
+    "highlight.js": "^10.1.2",
+    "node-sass": "^4.14.1"
   }
 }