Merge branch 'develop' of https://github.com/zurb/foundation-sites in…

…to develop

.npmignore

@@ -6,3 +6,10 @@ docs
 gulp
 lib
 spec
+bower.json
+composer.json
+CONTRIBUTING.md
+gulpfile.js
+meteor-README.md
+package.js
+sache.json

bower.json

@@ -8,8 +8,16 @@
   "ignore": [
     "config",
     "docs",
+    "gulp",
     "lib",
-    "spec"
+    "test",
+    "composer.json",
+    "CONTRIBUTING.md",
+    "gulpfile.js",
+    "meteor-README.md",
+    "package.js",
+    "package.json",
+    "sache.json"
   ],
   "dependencies": {
     "jquery": "~2.1.0",

docs/pages/global.md

@@ -101,17 +101,3 @@ To color a component, add the name of the color as a class.
   <p>Error fetching stick.</p>
 </div>
 ```
-
----
-
-## Namespacing
-
-The data attributes used to initialize Foundation plugins can be globally namespaced by setting the `$global-namespace` Sass variable.
-
-```html
-<!-- $global-namespace: false -->
-<div data-reveal></div>
-
-<!-- $global-namespace: 'zf' -->
-<div data-zf-reveal></div>
-```

scss/_global.scss

@@ -102,10 +102,6 @@ $global-weight-bold: bold !default;
 /// @type Number
 $global-radius: 0 !default;
 
-/// Namespace for the data attributes used to initialize Foundation plugins.
-/// @type String | Boolean
-$global-namespace: false !default;
-
 /// Sets the text direction of the CSS. Can be either `ltr` or `rtl`.
 $global-text-direction: ltr !default;
 

scss/grid/_classes.scss

@@ -70,7 +70,8 @@
   }
 
   // Column row
-  .#{$column}.#{$row} {
+  // The double .row class is needed to bump up the specificity
+  .#{$column}.#{$row}.#{$row} {
     float: none;
   }
 

scss/grid/_layout.scss

@@ -24,5 +24,9 @@
     &:nth-of-type(#{$n}n+1) {
       clear: both;
     }
+
+    &:last-child {
+      float: left;
+    }
   }
 }