Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
robbinjohansson committed Feb 24, 2017
2 parents 8df486c + 982352c commit 5fc8141
Show file tree
Hide file tree
Showing 17 changed files with 64 additions and 23,294 deletions.
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ Thumbs.db
*.swp

# Custom
node_modules/*
vendor/*
node_modules/*
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# v0.1.9
## 02/24/2017

1. [](#improved)
* Removed bower (use yarn instead) [PR #3](https://github.com/robbinfellow/haywire-grav/pull/3)
* Modified gulp imports [PR #3](https://github.com/robbinfellow/haywire-grav/pull/3)
* Improved `item.yaml` template
2. [](#bugfix)
* Gulp should require jquery first [PR #3](https://github.com/robbinfellow/haywire-grav/pull/3)

# v0.1.8
## 02/18/2017

Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Haywire is a modern starter theme/boilerplate for [Grav](https://getgrav.org/).
* Bootstrap-sass
* Laravel-elixir
* Gulp
* Bower

## Installation / Usage

Expand All @@ -26,7 +25,6 @@ Haywire is a modern starter theme/boilerplate for [Grav](https://getgrav.org/).
$ bin/gpm install haywire
$ cd /user/themes/haywire
$ yarn
$ bower install
$ gulp

### Manual installation
Expand All @@ -35,7 +33,6 @@ Haywire is a modern starter theme/boilerplate for [Grav](https://getgrav.org/).
$ git clone https://github.com/robbinfellow/haywire-grav.git haywire
$ cd haywire
$ yarn
$ bower install
$ gulp

### Demo
Expand Down
4 changes: 2 additions & 2 deletions blueprints.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Haywire
version: 0.1.8
version: 0.1.9
description: Starter theme/boilerplate for developers to get up and running quickly on new projects using modern frameworks and tools such as yarn, laravel-elixir & bootstrap-sass.
icon: empire
author:
Expand All @@ -8,7 +8,7 @@ author:
url: http://haywire.me
homepage: https://github.com/robbinfellow/haywire-grav
demo: http://haywire.me/haywire-grav-demo/
keywords: haywire, boilerplate, starter-theme, yarn, laravel-elixir, bootstrap-sass, gulp, bower
keywords: haywire, boilerplate, starter-theme, yarn, laravel-elixir, bootstrap-sass, gulp
bugs: https://github.com/robbinfellow/haywire-grav/issues
docs: https://github.com/robbinfellow/haywire-grav/blob/master/README.md
license: MIT
Expand Down
Loading

0 comments on commit 5fc8141

Please sign in to comment.