Hello, Pascal! (#105)

#97
amzn · Jul 18, 2018 · b4872ec · b4872ec
1 parent 864dc0f
commit b4872ec
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<img src="docs/assets/logo.png" alt="Style Dictionary logo" title="StyleDictionary" width="100" align="right" />
+<img src="docs/assets/logo.png" alt="Style Dictionary logo and mascot" title="&quot;Pascal&quot;" width="100" align="right" />
 
 [![npm version](https://img.shields.io/npm/v/style-dictionary.svg?style=flat-square)](https://badge.fury.io/js/style-dictionary)
 ![license](https://img.shields.io/npm/l/style-dictionary.svg?style=flat-square)
@@ -254,6 +254,11 @@ StyleDictionary.buildAllPlatforms();
 
 For more information on creating your own transforms, templates, and formats, take a look at our [docs](https://amzn.github.io/style-dictionary/).
 
+## Mascot
+
+The mascot for Style Dictionary is ["Pascal"](https://github.com/amzn/style-dictionary/issues/97) the chameleon (seen below). You can also find them blending in as the logo throughout the documentation.
+
+<img src="docs/assets/logo.png" alt="Style Dictionary logo and mascot" title="&quot;Pascal&quot;" width="240" />
 
 ## Contributing
 

diff --git a/example/complete/package.json b/example/complete/package.json
@@ -10,6 +10,6 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "style-dictionary": "2.2.0"
+    "style-dictionary": "2.2.1"
   }
 }
diff --git a/example/npm/package.json b/example/npm/package.json
@@ -18,6 +18,6 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "style-dictionary": "2.2.0"
+    "style-dictionary": "2.2.1"
   }
 }
diff --git a/example/react/package.json b/example/react/package.json
@@ -10,6 +10,6 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "style-dictionary": "2.2.0"
+    "style-dictionary": "2.2.1"
   }
 }
diff --git a/example/s3/package.json b/example/s3/package.json
@@ -14,6 +14,6 @@
   "devDependencies": {
     "aws-sdk": "^2.7.21",
     "fs-extra": "^1.0.0",
-    "style-dictionary": "2.2.0"
+    "style-dictionary": "2.2.1"
   }
 }
diff --git a/lib/utils/combineJSON.js b/lib/utils/combineJSON.js
@@ -36,7 +36,7 @@ function combineJSON(arr, deep, collision) {
   }
 
   for (i = 0; i < files.length; i++) {
-    var resolvedPath = resolveCwd(path.isAbsolute(files[i]) ? files[i] : '.' + path.sep + files[i]);
+    var resolvedPath = resolveCwd(path.isAbsolute(files[i]) ? files[i] : './' + files[i]);
     var file_content;
 
     try {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "style-dictionary",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Style once, use everywhere. A build system for creating cross-platform styles.",
   "keywords": [
     "style dictionary",