Merge branch 'master' into 'firebase-deploy'

# Conflicts:
#   .gitlab-ci.yml
#   Makefile
This commit is contained in:
Greenscreener 2019-07-25 10:59:29 +00:00
commit f774a4d9fd
4 changed files with 19 additions and 3 deletions

View File

@ -18,6 +18,7 @@ lint:
variables: variables:
DOCKER_HOST: "tcp://docker:2375/" DOCKER_HOST: "tcp://docker:2375/"
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
GIT_SUBMODULE_STRATEGY: none
script: script:
- docker-compose run xo-js-lint - docker-compose run xo-js-lint
- docker-compose run xo-html-lint - docker-compose run xo-html-lint

View File

@ -11,6 +11,3 @@ build:
serve: serve:
hugo server & hugo server &

View File

@ -110,4 +110,12 @@ h2 a {
#content { #content {
min-height: 90vh; min-height: 90vh;
} }
.logo404 {
font-size: 150px;
}
@include mobile {
.logo404 {
font-size: 95px;
}
}
// /Custom styles // /Custom styles

View File

@ -0,0 +1,10 @@
{{ define "main" }}
<div class="has-text-centered">
{{ partial "pageHeader.html" (dict "Title" "Page not found" "Permalink" "") }}
<div class="content">
<h3>Wut? The page you were looking for is not here. Either you can't type or we can't code. Or both.</h3>
</div>
<br>
<patek-logo class="logo404" title="404"></patek-logo>
</div>
{{ end }}