From 59e1226bfb0801c723f112a7c606d6d6f6fc09fb Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Wed, 10 Apr 2019 20:01:29 +0200 Subject: settling on design, adding giraffe, fixing css --- layouts/404.html | 7 + layouts/_default/baseof.html | 11 -- layouts/_default/list.html | 16 +++ layouts/_default/single.html | 10 ++ layouts/index.html | 24 +++- layouts/partials/footer.html | 6 +- layouts/partials/head.html | 21 +++ layouts/partials/header.html | 16 --- layouts/posts/posts.html.html | 6 + static/css/main.css | 304 +++++------------------------------------- static/img/giraffe.svg | 106 +++++++++++++++ 11 files changed, 228 insertions(+), 299 deletions(-) delete mode 100644 layouts/_default/baseof.html create mode 100644 layouts/partials/head.html delete mode 100644 layouts/partials/header.html create mode 100644 layouts/posts/posts.html.html create mode 100644 static/img/giraffe.svg diff --git a/layouts/404.html b/layouts/404.html index e69de29..2b9a6ec 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -0,0 +1,7 @@ +{{ partial "head" . }} + +
+ +

404

+
+{{ partial "footer" . }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html deleted file mode 100644 index 5f8e2ec..0000000 --- a/layouts/_default/baseof.html +++ /dev/null @@ -1,11 +0,0 @@ - - - {{- partial "head.html" . -}} - - {{- partial "header.html" . -}} -
- {{- block "main" . }}{{- end }} -
- {{- partial "footer.html" . -}} - - diff --git a/layouts/_default/list.html b/layouts/_default/list.html index e69de29..e69e3bf 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -0,0 +1,16 @@ +{{ partial "head" . }} +
+ + {{ .Content }} + + +
+{{ partial "footer" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index e69de29..37bc22c 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -0,0 +1,10 @@ +{{ partial "head" . }} +
+
+

{{ .Title }}

+ {{ .Date.Format "January 2, 2006" }} + +{{ .Content }} +
+
+{{ partial "footer" . }} diff --git a/layouts/index.html b/layouts/index.html index 6d3b85c..9c9fadc 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,3 +1,23 @@ -{{ partial "header" . }} -

Hello world! This is HTML5 Boilerplate.

+{{ partial "head" . }} + +
+ +

dnns.no

+
+
+

This site contains articles of various quality, and is sort of a private-but-public documentation of various things. Maybe there'll be some "normal" blog-posts at some point as well. Who knows.

+ +
+

Archive

+ {{ range (where .Data.Pages "Type" "post").GroupByDate "2006" }} +

{{ .Key }}

+ {{ range .Pages }} + + {{ end }} + {{ end }} +
+
{{ partial "footer" . }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index f5562b7..8dba16b 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,4 +1,4 @@ - - - + diff --git a/layouts/partials/head.html b/layouts/partials/head.html new file mode 100644 index 0000000..ffd8423 --- /dev/null +++ b/layouts/partials/head.html @@ -0,0 +1,21 @@ + + + + + + + + {{ .Title }} {{ if ne .Title .Site.Title }} · {{ .Site.Title }}{{ end }} + + + + + + + + +{{ if not .IsHome }} +
+ +
+{{ end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html deleted file mode 100644 index 45614b8..0000000 --- a/layouts/partials/header.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - {{ .Title }} {{ if ne .Title .Site.Title }} · {{ .Site.Title }}{{ end }} - - - - - - - - -
diff --git a/layouts/posts/posts.html.html b/layouts/posts/posts.html.html new file mode 100644 index 0000000..4c227df --- /dev/null +++ b/layouts/posts/posts.html.html @@ -0,0 +1,6 @@ +{{ partial "head" . }} +{{ partial "logo" . }} +
+ lol +
+{{ partial "footer" . }} diff --git a/static/css/main.css b/static/css/main.css index 86293f5..2531ef2 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -1,287 +1,57 @@ -/*! HTML5 Boilerplate v6.1.0 | MIT License | https://html5boilerplate.com/ */ - -/* - * What follows is the result of much research on cross-browser styling. - * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal, - * Kroc Camen, and the H5BP dev community and team. - */ - -/* ========================================================================== - Base styles: opinionated defaults - ========================================================================== */ - -html { - color: #222; - font-size: 1em; - line-height: 1.4; -} - -/* - * Remove text-shadow in selection highlight: - * https://twitter.com/miketaylr/status/12228805301 - * - * Vendor-prefixed and regular ::selection selectors cannot be combined: - * https://stackoverflow.com/a/16982510/7133471 - * - * Customize the background color to match your design. - */ - -::-moz-selection { - background: #b3d4fc; - text-shadow: none; +body { + font-family: 'Arial', 'Helvetica', sans-serif; + background-color: #fcfcf9; } -::selection { - background: #b3d4fc; - text-shadow: none; +header { + text-align: center; } - -/* - * A better looking default horizontal rule - */ - -hr { - display: block; - height: 1px; - border: 0; - border-top: 1px solid #ccc; - margin: 1em 0; - padding: 0; +header img#logo { + height: 10rem; } -/* - * Remove the gap between audio, canvas, iframes, - * images, videos and the bottom of their containers: - * https://github.com/h5bp/html5-boilerplate/issues/440 - */ - -audio, -canvas, -iframe, -img, -svg, -video { - vertical-align: middle; -} - -/* - * Remove default fieldset styles. - */ - -fieldset { - border: 0; - margin: 0; - padding: 0; -} - -/* - * Allow only vertical resizing of textareas. - */ - -textarea { - resize: vertical; -} - -/* ========================================================================== - Browser Upgrade Prompt - ========================================================================== */ - -.browserupgrade { - margin: 0.2em 0; - background: #ccc; - color: #000; - padding: 0.2em 0; -} - -/* ========================================================================== - Author's custom styles - ========================================================================== */ - - - - - - - - - - - - - - - - - -/* ========================================================================== - Helper classes - ========================================================================== */ - -/* - * Hide visually and from screen readers - */ - -.hidden { - display: none !important; +header img#logofloat { + float: right; + height: 5rem; } -/* - * Hide only visually, but have it available for screen readers: - * https://snook.ca/archives/html_and_css/hiding-content-for-accessibility - * - * 1. For long content, line feeds are not interpreted as spaces and small width - * causes content to wrap 1 word per line: - * https://medium.com/@jessebeach/beware-smushed-off-screen-accessible-text-5952a4c2cbfe - */ - -.visuallyhidden { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; - white-space: nowrap; /* 1 */ +main { + max-width: 50rem; + padding: 1.5rem; + margin: auto; } -/* - * Extends the .visuallyhidden class to allow the element - * to be focusable when navigated to via the keyboard: - * https://www.drupal.org/node/897638 - */ - -.visuallyhidden.focusable:active, -.visuallyhidden.focusable:focus { - clip: auto; - height: auto; - margin: 0; - overflow: visible; - position: static; - width: auto; - white-space: inherit; +span.single-date { + color: grey; } -/* - * Hide visually and from screen readers, but maintain layout - */ - -.invisible { - visibility: hidden; +pre { + background: #eeebee; + padding: 1rem; + overflow: scroll; } - -/* - * Clearfix: contain floats - * - * For modern browsers - * 1. The space content is one way to avoid an Opera bug when the - * `contenteditable` attribute is included anywhere else in the document. - * Otherwise it causes space to appear at the top and bottom of elements - * that receive the `clearfix` class. - * 2. The use of `table` rather than `block` is only necessary if using - * `:before` to contain the top-margins of child elements. - */ - -.clearfix:before, -.clearfix:after { - content: " "; /* 1 */ - display: table; /* 2 */ +pre code { + color: inherit; + background-color: inherit; } +code { + color: #911; + background-color: #eee; + } -.clearfix:after { - clear: both; -} -/* ========================================================================== - EXAMPLE Media Queries for Responsive Design. - These examples override the primary ('mobile first') styles. - Modify as content requires. - ========================================================================== */ +/**/ -@media only screen and (min-width: 35em) { - /* Style adjustments for viewports that meet the condition */ +article.list-item { + margin: 1rem; } - -@media print, - (-webkit-min-device-pixel-ratio: 1.25), - (min-resolution: 1.25dppx), - (min-resolution: 120dpi) { - /* Style adjustments for high resolution devices */ +span.list-item-date { + text-align: right; + float: right; + color: grey; } -/* ========================================================================== - Print styles. - Inlined to avoid the additional HTTP request: - https://www.phpied.com/delay-loading-your-print-css/ - ========================================================================== */ - -@media print { - *, - *:before, - *:after { - background: transparent !important; - color: #000 !important; /* Black prints faster */ - -webkit-box-shadow: none !important; - box-shadow: none !important; - text-shadow: none !important; - } - - a, - a:visited { - text-decoration: underline; - } - - a[href]:after { - content: " (" attr(href) ")"; - } - - abbr[title]:after { - content: " (" attr(title) ")"; - } - - /* - * Don't show links that are fragment identifiers, - * or use the `javascript:` pseudo protocol - */ - - a[href^="#"]:after, - a[href^="javascript:"]:after { - content: ""; - } - - pre { - white-space: pre-wrap !important; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - - /* - * Printing Tables: - * http://css-discuss.incutio.com/wiki/Printing_Tables - */ - - thead { - display: table-header-group; - } - - tr, - img { - page-break-inside: avoid; - } - - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - - h2, - h3 { - page-break-after: avoid; - } +footer { + margin: 2rem 0 1rem; + text-align: center; } diff --git a/static/img/giraffe.svg b/static/img/giraffe.svg new file mode 100644 index 0000000..9f5afba --- /dev/null +++ b/static/img/giraffe.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + -- cgit v1.2.3