From fa97be018921423dcfe7e96ba07535a08b81aae4 Mon Sep 17 00:00:00 2001
From: "Martin A. Midtsund" <martin.midtsund@sparebank1.no>
Date: Tue, 16 May 2017 10:08:23 +0200
Subject: [PATCH] Version 6.0.0 - Remove deprecated button names - Restructure
 tests - Add condensed property - Add live examples

---
 CHANGELOG.md | 14 +++++++++++++-
 package.json |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe3f435485..cbcc1ca0b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## v6.0.0
+* (BREAKING) Remove button names with 'FFE' prefix that were deprecated in v2.1.0
+    * To migrate to v6.0.0, change your button imports as follows:
+        * FFEActionButton -> ActionButton
+        * FFEButton -> Button
+        * FFEPrimaryButton -> PrimaryButton
+        * FFESecondaryButton -> SecondaryButton
+        * FFEShortcutButton -> ShortcutButton
+* Restructure tests
+* Add condensed property
+* Add live examples
+
 ## v5.2.0
 * Added support for icons in `<Button>`, `<SecondaryButton>` and `<TertiaryButton>`.
 * Modified `ShortcutButton` to pass the `<ChevronIcon>` as a `rightIcon` prop to `<Button>`
@@ -25,7 +37,7 @@
 ## v4.1.0
 
 * Fix truly disabling button while `isLoading` (CSS `pointer-events:none` was an obscure and inefficient way to achieve this)
-* `isLoading` will also set the attribute `aria-busy=true` on the button 
+* `isLoading` will also set the attribute `aria-busy=true` on the button
 
 ## v4.0.0
 
diff --git a/package.json b/package.json
index b1834ebd68..dd32b6e38a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ffe-buttons-react",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "description": "React implementation of ffe-buttons",
   "main": "lib/index.js",
   "scripts": {