Skip to content

Commit

Permalink
0.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
robbinjohansson committed Oct 20, 2017
1 parent 602de4b commit a975025
Show file tree
Hide file tree
Showing 36 changed files with 269 additions and 200 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# v0.3.0
## 10/20/2017

1. [](#new)
* Replace Bootstrap with Bulma
* Replace `scss` syntax with `sass`
2. [](#improved)
* Add responsive navbar toggle using Vue
* Repo improvements, add issue template
* Remove jquery
* Add additional templates

# v0.2.7
## 09/23/2017

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[![GitHub release](https://img.shields.io/github/release/robbinfellow/haywire-grav.svg?style=flat-square)](https://github.com/robbinfellow/haywire-grav/releases) [![](https://img.shields.io/github/issues-raw/robbinfellow/haywire-grav.svg?style=flat-square)](https://github.com/robbinfellow/haywire-grav/issues) [![license](https://img.shields.io/github/license/robbinfellow/haywire-grav.svg?style=flat-square)](https://github.com/robbinfellow/haywire-grav/blob/master/LICENSE)

# Boilerplate/theme for getgrav CMS
# Boilerplate/theme for Grav CMS

Haywire is a modern starter theme for [Grav](https://getgrav.org/). The idea behind the theme is to help developers get started quickly on their new grav projects using modern frameworks and tools such as [Laravel Mix](https://github.com/JeffreyWay/laravel-mix#readme), [Vuejs](http://vuejs.org/), [Bootstrap-sass](https://github.com/twbs/bootstrap-sass).
Haywire is a modern starter theme for [Grav](https://getgrav.org/). The idea behind the theme is to help developers get started quickly on their new grav projects using modern frameworks and tools such as [Laravel Mix](https://github.com/JeffreyWay/laravel-mix#readme), [Vuejs](http://vuejs.org/), [Bulma](https://github.com/jgthms/bulma).

**_It is recommended that you install the [admin-plugin package](https://github.com/getgrav/grav-plugin-admin) when using this theme._**

Expand All @@ -11,7 +11,7 @@ Haywire is a modern starter theme for [Grav](https://getgrav.org/). The idea beh
## Features

* Laravel Mix
* Bootstrap-sass
* Bulma
* Vuejs

## Installation / Usage
Expand Down
10 changes: 10 additions & 0 deletions _demo/pages/01.home/01.some-page/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
title: Some page
visible: true
template: default
---

# Some Page
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reiciendis consectetur laudantium alias autem obcaecati est, dolores nesciunt, vitae sed, distinctio numquam ad beatae impedit atque, nostrum? Earum, minus iusto non!

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cum porro reprehenderit, aut nobis temporibus veritatis rem eos maiores tempore alias harum atque perspiciatis aspernatur esse consequuntur, velit officiis veniam praesentium!
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
title: Home
visible: true
template: home
---

# Hello, world!
Haywire is a modern starter theme for [Grav](https://github.com/getgrav/grav). The idea behind the theme is to help developers get started quickly on their new grav projects using modern frameworks and tools such as [yarn](https://github.com/yarnpkg/yarn/), [laravel-mix](https://github.com/JeffreyWay/laravel-mix), [vuejs](https://github.com/vuejs/vue), and [bootstrap](https://github.com/twbs/bootstrap-sass).
Haywire is a modern starter theme for [Grav](https://github.com/getgrav/grav). The idea behind the theme is to help developers get started quickly on their new grav projects using modern frameworks and tools such as [laravel-mix](https://github.com/JeffreyWay/laravel-mix), [vuejs](https://github.com/vuejs/vue), and [bulma](https://github.com/jgthms/bulma).
5 changes: 0 additions & 5 deletions _demo/pages/blog/default.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
featured_image: sample_01.jpg
title: 'Getgrav is pretty cool'
featured_image: sample_01.jpg
published: true
publish_date: '05-03-2017 21:31'
template: item
---

Candy canes dragée jujubes muffin icing. Chocolate cake dessert macaroon dessert sesame snaps tart danish croissant. Sweet jelly pastry chocolate cake gummi bears marzipan gingerbread jelly. Sweet chupa chups gingerbread bonbon. Jelly-o cake cupcake cake bear claw caramels cupcake danish liquorice. Danish caramels gummi bears danish dessert brownie chupa chups tiramisu. Cotton candy pastry cupcake sweet roll halvah gingerbread jelly-o ice cream biscuit.
Candy canes dragée jujubes muffin icing. Chocolate cake dessert macaroon dessert sesame snaps tart danish croissant. Sweet jelly pastry chocolate cake gummi bears marzipan gingerbread jelly. Sweet chupa chups gingerbread bonbon. Jelly-o cake cupcake cake bear claw caramels cupcake danish liquorice. Danish caramels gummi bears danish dessert brownie chupa chups tiramisu. Cotton candy pastry cupcake sweet roll halvah gingerbread jelly-o ice cream biscuit.
7 changes: 7 additions & 0 deletions _demo/pages/blog/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: Blog
template: blog
---

# This is my blog
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Error dolorem cumque, debitis, vel quaerat ab totam dolorum velit neque sed laborum, sequi, mollitia eius corporis nihil id optio consectetur ex.
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
featured_image: sample_02.jpg
title: 'Sun is shining'
featured_image: sample_02.jpg
published: true
publish_date: '05-03-2017 21:28'
template: item
---

Candy canes jelly-o brownie dessert sugar plum toffee candy canes marzipan. Bear claw lemon drops jujubes lemon drops cookie cheesecake gummies. Jujubes jelly ice cream halvah muffin chocolate cake cookie danish. Donut sugar plum donut ice cream pie croissant sweet roll lemon drops tiramisu. Jujubes soufflé cake cake sweet roll gummi bears dessert powder gummi bears. Jelly beans toffee tiramisu muffin chocolate cake pudding tiramisu danish pastry. Apple pie marzipan apple pie bonbon icing cookie.
Candy canes jelly-o brownie dessert sugar plum toffee candy canes marzipan. Bear claw lemon drops jujubes lemon drops cookie cheesecake gummies. Jujubes jelly ice cream halvah muffin chocolate cake cookie danish. Donut sugar plum donut ice cream pie croissant sweet roll lemon drops tiramisu. Jujubes soufflé cake cake sweet roll gummi bears dessert powder gummi bears. Jelly beans toffee tiramisu muffin chocolate cake pudding tiramisu danish pastry. Apple pie marzipan apple pie bonbon icing cookie.
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
featured_image: sample_03.jpg
title: 'Today is a good day'
featured_image: sample_03.jpg
published: true
publish_date: '05-03-2017 21:38'
template: item
---

I love fruitcake chocolate cake donut halvah apple pie chocolate cake. Dessert cotton candy gummies candy carrot cake liquorice macaroon. Jelly dessert apple pie cotton candy brownie carrot cake. I love cotton candy tootsie roll croissant cake topping pastry. Jelly beans bear claw cake chocolate marshmallow macaroon. Apple pie sweet tart bonbon sweet cotton candy croissant. Pastry donut sugar plum jelly-o brownie sesame snaps sweet lollipop. I love tart oat cake I love. Cotton candy tiramisu croissant wafer cupcake brownie apple pie.
I love fruitcake chocolate cake donut halvah apple pie chocolate cake. Dessert cotton candy gummies candy carrot cake liquorice macaroon. Jelly dessert apple pie cotton candy brownie carrot cake. I love cotton candy tootsie roll croissant cake topping pastry. Jelly beans bear claw cake chocolate marshmallow macaroon. Apple pie sweet tart bonbon sweet cotton candy croissant. Pastry donut sugar plum jelly-o brownie sesame snaps sweet lollipop. I love tart oat cake I love. Cotton candy tiramisu croissant wafer cupcake brownie apple pie.
6 changes: 3 additions & 3 deletions blueprints.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Haywire
version: 0.2.7
description: Starter theme/boilerplate for developers to get up and running quickly on new Grav projects using modern frameworks and tools such as laravel-mix, vuejs & bootstrap-sass.
version: 0.3.0
description: Starter theme/boilerplate for developers to get up and running quickly on new Grav projects using modern frameworks and tools such as laravel-mix, vuejs, and bulma.
icon: empire
author:
name: Robbin Johansson
email: robbinfellow@gmail.com
url: https://github.com/robbinfellow/
homepage: https://github.com/robbinfellow/haywire-grav#readme
keywords: haywire, boilerplate, starter-theme, vuejs, laravel-mix, bootstrap-sass
keywords: haywire, boilerplate, starter-theme, vuejs, laravel-mix, bulma
bugs: https://github.com/robbinfellow/haywire-grav/issues
docs: https://github.com/robbinfellow/haywire-grav/blob/master/README.md
license: MIT
Expand Down
9 changes: 2 additions & 7 deletions dist/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ window.Vue = require('vue');
* or customize the JavaScript scaffolding to fit your unique needs.
*/

Vue.component('example', require('./components/Example.vue'));
Vue.component('navbar', require('./components/Navbar.vue'));

const app = new Vue({
el: '#app'
Expand Down
11 changes: 2 additions & 9 deletions js/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
/**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
* for JavaScript based Bootstrap features such as modals and tabs. This
* code may be modified to fit the specific needs of your application.
* Load additional javascript using this file
* e.g require('jquery')
*/

try {
window.$ = window.jQuery = require('jquery');

require('bootstrap-sass');
} catch (e) {}
38 changes: 0 additions & 38 deletions js/components/Example.vue

This file was deleted.

19 changes: 19 additions & 0 deletions js/components/Navbar.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<script>
export default {
mounted() {
//
},
data() {
return {
navIsActive: false
}
},
methods: {
toggleNav(){
!this.navIsActive ? this.navIsActive = true : this.navIsActive = false;
}
}
}
</script>
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "haywire-grav",
"version": "0.2.7",
"version": "0.3.0",
"homepage": "https://github.com/robbinfellow/haywire-grav#readme",
"author": "Robbin Johansson <robbinfellow@gmail.com>",
"repository": {
Expand All @@ -21,9 +21,8 @@
},
"devDependencies": {
"babel-polyfill": "^6.26.0",
"bootstrap-sass": "^3.3.7",
"bulma": "^0.6.0",
"cross-env": "^5.0.1",
"jquery": "^3.1.1",
"laravel-mix": "^1.5.0",
"vue": "^2.5.0"
}
Expand Down
2 changes: 2 additions & 0 deletions sass/_variables.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

// Use this file to override default bulma variables
13 changes: 13 additions & 0 deletions sass/app.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

// Custom variables
@import "variables"

// Import Bulma
@import "~bulma"

// Common
@import "common/general"

// Partials
@import "partials/navbar"
@import "partials/footer"
2 changes: 2 additions & 0 deletions sass/common/_general.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.is-rounded
border-radius: 50%
3 changes: 3 additions & 0 deletions sass/partials/_footer.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.footer
margin-top: 2rem
box-shadow: 0 1000px 0 1000px $footer-background-color
5 changes: 5 additions & 0 deletions sass/partials/_navbar.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.navbar
border-bottom: solid 1px $grey-lighter

.navbar-burger
border: 0
Binary file modified screenshot.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions scss/_variables.scss

This file was deleted.

5 changes: 0 additions & 5 deletions scss/app.scss

This file was deleted.

38 changes: 38 additions & 0 deletions templates/blog.html.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{% extends 'partials/base.html.twig' %}

{% block content %}
<div class="container">
<div class="columns">
<div class="column is-8 is-offset-2">

<div class="columns">
<div class="column content">
{{ page.content }}
</div>
</div>

<hr>

<div class="columns is-multiline">
{% for post in page.find('/blog').children.order('date', 'desc').slice(0, 3) %}
<div class="column is-12">
<strong class="title is-5">
<a href="{{ base_url }}{{ post.route }}">
{{ post.title }}
</a>
</strong>
<div class="summary">
{% if post.summary %}
{{ post.summary(320) }}
{% else %}
<em>This post has no summary!</em>
{% endif %}
</div>
</div>
{% endfor %}
</div>

</div>
</div>
</div>
{% endblock %}
44 changes: 9 additions & 35 deletions templates/default.html.twig
Original file line number Diff line number Diff line change
@@ -1,45 +1,19 @@
{% extends 'partials/base.html.twig' %}

{% block content %}
<div class="row">
<div class="col-xs-12">
{{ page.content }}

<hr>

</div>
</div>

{# Display example vue-component #}
<example></example>

<div class="row">

{% for post in page.find('/blog').children.order('date', 'desc').slice(0, 3) %}

<div class="col-sm-12">

<div class="row">
<div class="col-sm-12">
<h3>
<a href="{{ base_url }}{{ post.route }}">
{{ post.title }}
</a>
</h3>
<div class="summary">
{% if post.summary %}
{{ post.summary(320) }}
{% else %}
<em>This post has no summary!</em>
{% endif %}
</div>
</div>
<div class="container">
<div class="columns">
<div class="column is-8 is-offset-2">

<div class="columns">
<div class="column content">
{{ page.content }}
</div>

</div>

{% endfor %}

</div>
</div>
</div>

{% endblock %}
Loading

0 comments on commit a975025

Please sign in to comment.