Merge pull request #114 from cferdinandi/development

Fixed JS concatenation bug

.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - "0.11"
   - "0.10"
 before_script:
   - npm install -g gulp

README.md

@@ -16,6 +16,8 @@ Kraken is free to use under the [MIT License](http://gomakethings.com/mit/).
 
 Kraken uses [semantic versioning](http://semver.org/).
 
+* v3.8.2 - September 28, 2014
+    * Fixed JS concatenation bug.
 * v3.8.1 - August 24, 2014
     * Fixed unit tests path.
     * Added feature testing and main JS files to their own subfolders for concatenation.

dist/css/kraken.css

@@ -1,5 +1,5 @@
 /**
- * Kraken v3.8.1
+ * Kraken v3.8.2
  * A lightweight front-end boilerplate, by Chris Ferdinandi.
  * http://github.com/cferdinandi/kraken
  * 
@@ -324,7 +324,7 @@ body {
   font-size: 100%;
   line-height: 1.5;
   color: #272727;
-  background: white;
+  background: #ffffff;
 }
 @media (min-width: 40em) {
   body {
@@ -362,7 +362,7 @@ p {
  * Alternate text colors
  */
 .text-muted {
-  color: gray;
+  color: #808080;
 }
 
 /**
@@ -491,7 +491,7 @@ hr {
   margin: 2em auto;
   border: 0;
   border-top: 0.0725em solid #e5e5e5;
-  border-bottom: 0 solid white;
+  border-bottom: 0 solid #ffffff;
 }
 
 strong {
@@ -524,16 +524,16 @@ sub {
  * Highlighting colors
  */
 ::-moz-selection {
-  color: white;
+  color: #ffffff;
   background: #0088cc;
 }
 ::selection {
-  color: white;
+  color: #ffffff;
   background: #0088cc;
 }
 
 ::-moz-selection {
-  color: white;
+  color: #ffffff;
   background: #0088cc;
 }
 
@@ -623,7 +623,7 @@ a .btn:focus,
 .btn:active,
 a .btn:active,
 .btn.active {
-  color: white;
+  color: #ffffff;
 }
 
 .btn:hover,
@@ -639,8 +639,8 @@ a .btn:active,
 }
 
 .btn-secondary {
-  background-color: gray;
-  border-color: gray;
+  background-color: #808080;
+  border-color: #808080;
 }
 
 .btn-secondary:hover,

dist/css/kraken.css.min.map

@@ -0,0 +1 @@
+/** Kraken v3.8.2, by Chris Ferdinandi | http://github.com/cferdinandi/kraken | Licensed under MIT: http://gomakethings.com/mit/ */

dist/js/detects.js

@@ -1,5 +1,5 @@
 /**
- * Kraken v3.8.1
+ * Kraken v3.8.2
  * A lightweight front-end boilerplate, by Chris Ferdinandi.
  * http://github.com/cferdinandi/kraken
  *