Merge branch 'release/0.2.6'

riccio82 · Nov 20, 2015 · 5a5a411 · 5a5a411
2 parents 84c0f3b + 4b2da64
commit 5a5a411
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 0.2.6 - Nov 20, 2015
+
+**Bugfix from PR:**
+
+* Fix wrapper styles override.
+
+
 ## 0.2.5 - Oct 15, 2015
 
 **Implemented enhancements:**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-notification-system",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "A React Notification System fully customized",
   "main": "dist/NotificationSystem.js",
   "scripts": {

diff --git a/src/NotificationSystem.jsx b/src/NotificationSystem.jsx
@@ -19,7 +19,7 @@ var NotificationSystem = React.createClass({
 
     wrapper: function() {
       if (!this.overrideStyle) return {};
-      return merge({}, Styles.Wrapper, this.overrideStyle);
+      return merge({}, Styles.Wrapper, this.overrideStyle.Wrapper);
     },
 
     container: function(position) {