From 5ea7b1abf2cae7b55ab55bd2a4295acf5405bbde Mon Sep 17 00:00:00 2001 From: Sudhakar Date: Thu, 19 Nov 2015 15:02:16 +0530 Subject: [PATCH 1/2] Fix Wrapper style overrides --- src/NotificationSystem.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NotificationSystem.jsx b/src/NotificationSystem.jsx index dc4dc46..c11b4e1 100644 --- 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) { From 4b2da645cde9467c95863079c9299009049ab250 Mon Sep 17 00:00:00 2001 From: Igor Prado Date: Fri, 20 Nov 2015 17:28:19 -0200 Subject: [PATCH 2/2] Updated changelog, bumped package version --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c685a19..f90532e 100644 --- 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 index f1e8970..65148fe 100644 --- 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": {