Merge remote-tracking branch 'origin/master' into UXUI-212

holidayextras · Jun 19, 2015 · 5c19930 · 5c19930
2 parents ac7205c + 00305eb
commit 5c19930
Show file tree

Hide file tree

Showing 17 changed files with 82,719 additions and 14,913 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,3 @@
 **/dev/*.js
+*.less
+**/*.less
diff --git a/.eslintrc b/.eslintrc
@@ -16,7 +16,11 @@
     "jsx": true
   },
   "rules": {
-    "quotes": [2, 'single'],
-    "strict": [2, 'never']
+    "quotes": [2, "single"],
+    "strict": [2, "never"],
+    "brace-style": [2, "1tbs"],
+    "indent": [2, 2],
+    "linebreak-style": [2, "unix"],
+    "semi": [2, "always"]
   }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+### 0.6.8 - 2015-06-15
+### 0.6.7 - 2015-06-15
 ### 0.6.6 - 2015-05-29
 - Adds default purpose and size to button (and flag)
 - Swaps button tag to anchor tag when an href is passed in