From a10e94cd95c392bee97e8d5cb884fbe1b0f77db8 Mon Sep 17 00:00:00 2001
From: Bud Parr <budparr@gmail.com>
Date: Tue, 11 Apr 2017 02:17:47 +0000
Subject: [PATCH] placeholder
---
src/webpack.config.js | 8 --------
theme.toml | 8 ++++----
layouts/404.html | 12 ++++++++----
404.html | 7 +++++++
4 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/404.html b/404.html
index a493242..d20fd99 100755
--- a/404.html
+++ b/404.html
@@ -1,5 +1,6 @@
{{ define "header" }}{{ partial "page-header.html" . }}{{ end }}
{{ define "main" }}
+<<<<<<< Updated upstream
{{ $currentPageUrl := .URL }}
{{ $currentSection := where .Site.Pages "Section" .Section }}
<article class="center cf pv5 measure-wide-l">
@@ -7,4 +8,10 @@
This is not the page you were looking for
</h1>
</article>
+=======
+
+404 page hee
+{{ .Content }}
+
+>>>>>>> Stashed changes
{{ end }}
diff --git a/layouts/404.html b/layouts/404.html
index 3b06cd6..a493242 100755
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,6 +1,10 @@
+{{ define "header" }}{{ partial "page-header.html" . }}{{ end }}
{{ define "main" }}
-<main class="cf pa5 pa4-l f4 tc center measure-wide lh-copy gray">
- <h1>Page not found</h1>
- {{ .Content }}
-</main>
+{{ $currentPageUrl := .URL }}
+{{ $currentSection := where .Site.Pages "Section" .Section }}
+ <article class="center cf pv5 measure-wide-l">
+ <h1>
+ This is not the page you were looking for
+ </h1>
+ </article>
{{ end }}
diff --git a/src/webpack.config.js b/src/webpack.config.js
index 05670ae..4e42bf5 100644
--- a/src/webpack.config.js
+++ b/src/webpack.config.js
@@ -2,7 +2,6 @@
var ExtractTextPlugin = require("extract-text-webpack-plugin");
var webpack = require("webpack");
module.exports = {
- // context: path.resolve(__dirname, './src'),
entry: {
app: './js/main.js'
},
@@ -14,13 +13,6 @@
fallback: "style-loader",
use: 'css-loader?importLoaders=1!postcss-loader'
})
- },
- {
- test: /\.(jpe?g|png|gif|svg)$/i,
- use: [
- 'url-loader?limit=10000',
- 'img-loader'
- ]
}
]
},
diff --git a/theme.toml b/theme.toml
index 41d4996..c96a2d9 100755
--- a/theme.toml
+++ b/theme.toml
@@ -1,14 +1,14 @@
# theme.toml template for a Hugo theme
# See https://github.com/spf13/hugoThemes#themetoml for an example
-name = "Gohugo Default"
+name = "Gohugo Default Theme"
license = "MIT"
-licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE.md"
+licenselink = "https://github.com/budparr/gohugo-default-theme/blob/master/LICENSE.md"
description = ""
-homepage = "http://siteforthistheme.com/"
+homepage = "https://github.com/budparr/gohugo-default-theme"
tags = ["website", "starter"]
features = ["", ""]
-min_version = 0.18
+min_version = 0.19
[author]
name = "Bud Parr"
--
Gitblit v1.10.0