Merge pull request #14 from smartgravity/develop

Update to Foundation v6.1.2 and other fixes

CHANGELOG.md

@@ -1,3 +1,15 @@
+# v0.4.0
+## 2/1/2016
+
+1. [](#improved)
+    * Updated to Foundation v6.1.2
+    * Fixed content and logo alignment for default template layouts
+2. [](#bugfix)
+    * Added custom.scss file so Custom CSS option will work
+    * Removed composer.json file as it is not needed anymore
+    * Removed unneeded streams from Theme YAML
+    * Removed unnecessary Foundation "index.html" file
+
 # v0.3.1
 ## 1/24/2016
 

README.md

@@ -1,6 +1,8 @@
 # Bones - Grav Theme
 
-**Foundation: v6.1.1** | **FontAwesome: v4.5.0**
+[![Foundation Version](https://img.shields.io/badge/Foundation-v6.1.2-orange.svg)](http://foundation.zurb.com/) 
+[![FontAwesome Version](https://img.shields.io/badge/FontAwesome-v4.5.0-blue.svg)](https://fortawesome.github.io/Font-Awesome/) 
+[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](http://sgne.ws/1KPEcMD)
 
 **Bones** is a [Grav](http://getgrav.org) theme based on [Foundation6](http://foundation.zurb.com/) by Zurb and Includes [FontAwesome](https://fortawesome.github.io/Font-Awesome/). This is a base theme meant to be customized. The idea is to provide a starting point for your next custom project.
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Bones
-version: 0.3.1
+version: 0.4.0
 description: "A **Grav** theme built with **Foundation**."
 icon: cubes
 author:

bones.yaml

@@ -1,3 +1,4 @@
+enabled: true
 dropdown:
   enabled: false
 fontawesome:
@@ -48,10 +49,3 @@ css_sticky:
   enabled: true
 css_table:
   enabled: true
-
-streams:
-  schemes:
-    theme:
-      type: ReadOnlyStream
-      paths:
-        - user/themes/bones

bower_components/foundation-sites/.bower.json

@@ -1,6 +1,6 @@
 {
   "name": "foundation-sites",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "main": [
     "scss/foundation.scss",
     "dist/foundation.js"
@@ -29,11 +29,11 @@
     "what-input": "~1.1.2"
   },
   "homepage": "https://github.com/zurb/foundation-sites",
-  "_release": "6.1.1",
+  "_release": "6.1.2",
   "_resolution": {
     "type": "version",
-    "tag": "v6.1.1",
-    "commit": "b19360be6b44857bb1ec93f96478fc3086c0b642"
+    "tag": "v6.1.2",
+    "commit": "b7cedf57265b8c8ed9b746096cc2dd9dade9c55c"
   },
   "_source": "git://github.com/zurb/foundation-sites.git",
   "_target": "~6.1.0",

bower_components/foundation-sites/.travis.yml

@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+  - "0.12"
+install:
+  - npm install -g bower
+  - npm install

bower_components/foundation-sites/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2015 ZURB, inc.
+Copyright (c) 2013-2016 ZURB, inc.
 
 MIT License
 

bower_components/foundation-sites/README.md

@@ -1,12 +1,12 @@
 # [Foundation for Sites](http://foundation.zurb.com) (v6.1)
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/zurb/foundation-sites?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![npm version](https://badge.fury.io/js/foundation-sites.svg)](https://badge.fury.io/js/foundation-sites) [![Bower version](https://badge.fury.io/bo/foundation-sites.svg)](https://badge.fury.io/bo/foundation-sites) [![Gem Version](https://badge.fury.io/rb/foundation-rails.svg)](https://badge.fury.io/rb/foundation-rails) [![devDependency Status](https://david-dm.org/zurb/foundation-sites/dev-status.svg)](https://david-dm.org/zurb/foundation-sites#info=devDependencies) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/zurb/foundation-sites?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 Foundation is the most advanced responsive front-end framework in the world. Quickly go from prototype to production, building sites or apps that work on any kind of device with Foundation. Includes layout constructs, like a fully customizable, responsive grid, commonly used JavaScript plugins, and full A11Y support.
 
 ## Requirements
 
-Requires NodeJS to be installed on your machine. Works with 0.10, 0.12, and 4.1! **Note that parts of our build process will break with NPM 3, due to the changes in how packages are installed.**
+Requires NodeJS to be installed on your machine. Works with version 0.12 and higher!
 
 The Sass is compiled using libsass, which requires the GCC to be installed on your machine. Windows users can install it through [MinGW](http://www.mingw.org/), and Mac users can install it through the [Xcode Command-line Tools](http://osxdaily.com/2014/02/12/install-command-line-tools-mac-os-x/).
 
@@ -48,4 +48,4 @@ foundation/
 │   └── ...
 ```
 
-Copyright (c) 2015 ZURB, inc.
+Copyright (c) 2016 ZURB, inc.

bower_components/foundation-sites/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "foundation-sites",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "main": [
     "scss/foundation.scss",
     "dist/foundation.js"