Merge branch 'master' into fix_46-gulp-watch

This commit is contained in:
Christopher Geary 2017-10-07 09:17:40 +01:00 committed by GitHub
commit bf9c2899cf
5 changed files with 11266 additions and 9 deletions

View File

@ -1,5 +1,5 @@
{ {
"presets": ["es2015"], "presets": ["env"],
"plugins": [ "plugins": [
"syntax-object-rest-spread", "syntax-object-rest-spread",
"transform-object-rest-spread" "transform-object-rest-spread"

View File

@ -69,8 +69,8 @@ to `/dist/css/{filename}.css`. Import statements will be resolved as part of the
## Environment variables ## Environment variables
Two seperate the development and production *- aka build -* stages, all gulp
tasks run with a node environment variable named either `development` or To seperate the development and production *- aka build -* stages, all gulp tasks run with a node environment variable named either `development` or
`production`. `production`.
You can access the environment variable inside the theme files with You can access the environment variable inside the theme files with
@ -90,7 +90,7 @@ Now netlify will build and deploy your site whenever you push to git.
You can also click this button: You can also click this button:
[![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/eliwilliamson/victor-hugo) [![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/netlify/victor-hugo)

11255
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -2,6 +2,7 @@
"name": "victor-hugo", "name": "victor-hugo",
"version": "1.0.0", "version": "1.0.0",
"description": "Victor Hugo is a Hugo boilerplate for creating truly epic websites!", "description": "Victor Hugo is a Hugo boilerplate for creating truly epic websites!",
"repository": "netlify/victor-hugo",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"hugo": "gulp hugo", "hugo": "gulp hugo",
@ -19,7 +20,7 @@
"babel-plugin-transform-class-properties": "^6.10.2", "babel-plugin-transform-class-properties": "^6.10.2",
"babel-plugin-transform-object-assign": "^6.8.0", "babel-plugin-transform-object-assign": "^6.8.0",
"babel-plugin-transform-object-rest-spread": "^6.8.0", "babel-plugin-transform-object-rest-spread": "^6.8.0",
"babel-preset-es2015": "^6.9.0", "babel-preset-env": "1.6.0",
"babel-register": "^6.11.6", "babel-register": "^6.11.6",
"browser-sync": "^2.13.0", "browser-sync": "^2.13.0",
"css-loader": "^0.28.2", "css-loader": "^0.28.2",
@ -32,12 +33,12 @@
"gulp-postcss": "^6.1.1", "gulp-postcss": "^6.1.1",
"gulp-util": "^3.0.7", "gulp-util": "^3.0.7",
"gulp-watch": "^4.3.11", "gulp-watch": "^4.3.11",
"hugo-bin": "^0.12.0", "hugo-bin": "^0.13.0",
"imports-loader": "^0.7.1", "imports-loader": "^0.7.1",
"postcss-cssnext": "^2.7.0", "postcss-cssnext": "^2.7.0",
"postcss-import": "^10.0.0", "postcss-import": "^10.0.0",
"url-loader": "^0.5.7", "url-loader": "^0.5.7",
"webpack": "^2.6.0", "webpack": "3.6.0",
"whatwg-fetch": "^1.0.0" "whatwg-fetch": "^1.0.0"
} }
} }

View File

@ -2,6 +2,7 @@
<html lang="{{ $.Site.Language.Lang }}"> <html lang="{{ $.Site.Language.Lang }}">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<base href="{{ $.Site.BaseURL }}"> <base href="{{ $.Site.BaseURL }}">
<title>{{ $.Site.Title }}</title> <title>{{ $.Site.Title }}</title>
<link rel="stylesheet" href="css/main.css"/> <link rel="stylesheet" href="css/main.css"/>