nindwen.blue

my home page
git clone https://git.nindwen.blue/nindwen.blue.git
Log | Files | Refs | README

commit c31f6d776f3af8611d94fb840fa7da190719aa3e
parent baba1074caf6c12cbeb2a346e87d8a33f6455280
Author: Laura Ketola <me@nindwen.blue>
Date:   Sat, 14 Apr 2018 01:08:33 +0300

Reorganizing

Diffstat:
Makefile | 13++++++-------
foot.html | 4----
head.html | 21---------------------
head2.html | 7-------
head3.html | 7-------
main.scss | 105-------------------------------------------------------------------------------
notes-template.html | 41-----------------------------------------
notes.scss | 116-------------------------------------------------------------------------------
style/main.scss | 105+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
style/notes.scss | 116+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
template/foot.html | 4++++
template/head.html | 21+++++++++++++++++++++
template/head2.html | 7+++++++
template/head3.html | 7+++++++
template/notes-template.html | 41+++++++++++++++++++++++++++++++++++++++++
15 files changed, 307 insertions(+), 308 deletions(-)

diff --git a/Makefile b/Makefile @@ -3,19 +3,18 @@ OUT_NOTES := $(patsubst notes/%.md,output/notes/%.html,$(SRC_NOTES)) default: push -output/index.html: index.md output/main.css head.html head2.html foot.html - pandoc $< | cat head.html output/main.css head2.html - foot.html > $@ +output/index.html: index.md output/main.css template/head.html template/head2.html template/foot.html + pandoc $< | cat template/head.html output/main.css template/head2.html - template/foot.html > $@ -output/%.css: %.scss +output/%.css: style/%.scss sass --sourcemap=none --style compressed $< $@ output/notes/%.html: notes/%.md output/notes.css - pandoc --highlight-style=breezedark --template=notes-template.html $< > $@ + pandoc --highlight-style=breezedark --template=template/notes-template.html $< > $@ .PHONY: notes -notes: $(OUT_NOTES) output/notes.css head.html head3.html foot.html - ruby build_index.rb | cat head.html output/notes.css head3.html - foot.html > output/notes/index.html - echo $(OUT_NOTES) +notes: $(OUT_NOTES) output/notes.css template/head.html template/head3.html template/foot.html + ruby build_index.rb | cat template/head.html output/notes.css template/head3.html - template/foot.html > output/notes/index.html .PHONY: push push: output/index.html notes diff --git a/foot.html b/foot.html @@ -1,4 +0,0 @@ - </div> - <footer>© laura ketola 2018</footer> - </body> -</html> diff --git a/head.html b/head.html @@ -1,21 +0,0 @@ -<!doctype html> - -<!-- - This page is generated with a simple makefile from markdown. - As a consequense, this source is not very readable. - Somewhat up-to-date source is available at - https://github.com/nindwen/nindwen.blue ---> - -<html lang="en"> - <head> - <title>nindwen</title> - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="author" content="Laura Ketola"> - <meta name="description" content="Laura Ketola's contact page and blog."> - <link rel="shortcut icon" type="image/png" href="66006f.png"/> - <meta name="theme-color" content="#66006f"> - <meta name="google-site-verification" content="h95iC1UVYOooJsjQ06MmTiYJLmhsc96FSkuen8NDL0k" /> - - <style> diff --git a/head2.html b/head2.html @@ -1,7 +0,0 @@ - </style> - </head> - <body> - <header> - <img src="persikka.png" alt="Header image. The word Persikka written in tengwar." /> - </header> - <div id="content"> diff --git a/head3.html b/head3.html @@ -1,7 +0,0 @@ - </style> - </head> - <body> - <header> - <a href="/">nindwen.blue</a> » <a href="/notes">notes</a> - </header> - <div id="content"> diff --git a/main.scss b/main.scss @@ -1,105 +0,0 @@ -$back: #fefefe; -$front: #1b1b1b; -$accent: #66006f; - -$font-stack: ‘Palatino Linotype’, ‘Book Antiqua’, Palatino, serif; -$mono-stack: "Courier New", Courier, monospace; - -html, body { - font-family: $font-stack; - font-size: 14pt; - background: $back; - color: $front; - height: 100%; - margin: 0px; - padding: 0px; -} - -#content { - background: $back; - max-width: 500px; - padding: 50px; - padding-bottom: 0px; - padding-top: 0px; - margin: auto; - text-align: left; - line-height: 1.5; - - em { - color: $accent; - font-style: normal; - font-weight: bold; - } - - blockquote { - font-style: italic; - border-left: solid lightgrey 4px; - padding-left: 20px; - color: grey; - } - - code { - display: block; - font-family: $mono-stack; - font-size: 90%; - color: grey; - line-height: 1.0; - } - - h3 { - color: $accent; - } - - table { - margin: 0 auto; - - th, td { - padding: 20px; - padding-top: 0px; - padding-bottom: 0px; - } - - td:nth-child(1) { - font-weight: bold; - color: $accent; - } - - tr { - border-bottom: 1px solid $front; - } - } - - - a, a:visited { - color: $accent; - } - -} - -header { - max-width: 200px; - margin: auto; - - img { - max-width: 100%; - } -} - - -hr { - border: 0; - height: 2px; - background-image: linear-gradient(to left, $back, $accent, $back); - background-image: -webkit-linear-gradient(to left, $back, $accent, $back); - background-image: -moz-linear-gradient(to left, $back, $accent, $back); - background-image: -ms-linear-gradient(to left, $back, $accent, $back); - background-image: -o-linear-gradient(to left, $back, $accent, $back); -} - -footer { - text-align: center; - color: grey; - margin: 20px; - font-size: 90%; -} - diff --git a/notes-template.html b/notes-template.html @@ -1,41 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<meta charset="utf-8" /> -<meta name="generator" content="pandoc" /> -<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> -<title>$title$</title> -$if(highlighting-css)$ -<style type="text/css"> -$highlighting-css$ -</style> -$endif$ -<link rel="stylesheet" href="/notes.css"> -<link rel="shortcut icon" type="image/png" href="/66006f.png"/> -<meta name="theme-color" content="#66006f"> -</head> -<body> -$for(include-before)$ -$include-before$ -$endfor$ -<header> -<a href="/">nindwen.blue</a> » <a href="/notes">notes</a> » $title$ -$if(date)$ -<span class="date">$date$</span> -$endif$ -</header> -$if(toc)$ -<nav id="$idprefix$TOC"> -$table-of-contents$ -</nav> -$endif$ -<div id="content"> -$body$ -</div> -$for(include-after)$ -$include-after$ -$endfor$ -<footer> -</footer> -</body> -</html> diff --git a/notes.scss b/notes.scss @@ -1,116 +0,0 @@ -$faint: #bbb; -$front: #333333; -$back: #fefefe; - -body { - background: $back; -} - -#content, header, footer { - max-width: 700px; - margin: auto; - font-size: 16pt; - font-family: Helvetica, Arial, sans-serif; - line-height: 1.6em; - color: $front; - - img { - text-align: center; - border-radius: 10px; - box-shadow: 1px 1px 20px $front; - max-width: 90%; - } - - figcaption { - text-align: center; - font-style: italic; - color: grey; - font-size: 80%; - } -} - -header, footer, -header a, -header a:visited { - color: $faint; - text-decoration: none; -} - -header { - margin-bottom: 60px; - margin-top: 20px; - - .date { - float: right; - } -} - -footer { - border-top: 1px solid $faint; - -} - -h1 { - border-bottom: 1px solid $faint; - font-size: 150%; -} - -h2, h3, h4, h5 { - font-size: 120%; -} - -h1:before { - content: '# '; - color: $faint; -} - -h2:before { - content: '## '; - color: $faint; -} - -h3:before { - content: '### '; - color: $faint; -} - -div.sourceCode { - background: $front; - color: $back; - border-radius: 5px; - padding: 10px; - margin: 10px; - font-size: 80%; - box-shadow: 1px 1px 10px $front; -} - -blockquote { - font-style: italic; - border-left: solid $faint 4px; - padding-left: 20px; - color: grey; -} - -ul { - padding: 50px; - border: 1px solid $faint; - border-radius: 10px; - - a { - text-decoration: none; - } - - li { - list-style-type: none; - } - - .date { - color: $faint; - } - .title { - padding-left: 30px; - color: $front; - text-decoration: underline; - } -} - diff --git a/style/main.scss b/style/main.scss @@ -0,0 +1,105 @@ +$back: #fefefe; +$front: #1b1b1b; +$accent: #66006f; + +$font-stack: ‘Palatino Linotype’, ‘Book Antiqua’, Palatino, serif; +$mono-stack: "Courier New", Courier, monospace; + +html, body { + font-family: $font-stack; + font-size: 14pt; + background: $back; + color: $front; + height: 100%; + margin: 0px; + padding: 0px; +} + +#content { + background: $back; + max-width: 500px; + padding: 50px; + padding-bottom: 0px; + padding-top: 0px; + margin: auto; + text-align: left; + line-height: 1.5; + + em { + color: $accent; + font-style: normal; + font-weight: bold; + } + + blockquote { + font-style: italic; + border-left: solid lightgrey 4px; + padding-left: 20px; + color: grey; + } + + code { + display: block; + font-family: $mono-stack; + font-size: 90%; + color: grey; + line-height: 1.0; + } + + h3 { + color: $accent; + } + + table { + margin: 0 auto; + + th, td { + padding: 20px; + padding-top: 0px; + padding-bottom: 0px; + } + + td:nth-child(1) { + font-weight: bold; + color: $accent; + } + + tr { + border-bottom: 1px solid $front; + } + } + + + a, a:visited { + color: $accent; + } + +} + +header { + max-width: 200px; + margin: auto; + + img { + max-width: 100%; + } +} + + +hr { + border: 0; + height: 2px; + background-image: linear-gradient(to left, $back, $accent, $back); + background-image: -webkit-linear-gradient(to left, $back, $accent, $back); + background-image: -moz-linear-gradient(to left, $back, $accent, $back); + background-image: -ms-linear-gradient(to left, $back, $accent, $back); + background-image: -o-linear-gradient(to left, $back, $accent, $back); +} + +footer { + text-align: center; + color: grey; + margin: 20px; + font-size: 90%; +} + diff --git a/style/notes.scss b/style/notes.scss @@ -0,0 +1,116 @@ +$faint: #bbb; +$front: #333333; +$back: #fefefe; + +body { + background: $back; +} + +#content, header, footer { + max-width: 700px; + margin: auto; + font-size: 16pt; + font-family: Helvetica, Arial, sans-serif; + line-height: 1.6em; + color: $front; + + img { + text-align: center; + border-radius: 10px; + box-shadow: 1px 1px 20px $front; + max-width: 90%; + } + + figcaption { + text-align: center; + font-style: italic; + color: grey; + font-size: 80%; + } +} + +header, footer, +header a, +header a:visited { + color: $faint; + text-decoration: none; +} + +header { + margin-bottom: 60px; + margin-top: 20px; + + .date { + float: right; + } +} + +footer { + border-top: 1px solid $faint; + +} + +h1 { + border-bottom: 1px solid $faint; + font-size: 150%; +} + +h2, h3, h4, h5 { + font-size: 120%; +} + +h1:before { + content: '# '; + color: $faint; +} + +h2:before { + content: '## '; + color: $faint; +} + +h3:before { + content: '### '; + color: $faint; +} + +div.sourceCode { + background: $front; + color: $back; + border-radius: 5px; + padding: 10px; + margin: 10px; + font-size: 80%; + box-shadow: 1px 1px 10px $front; +} + +blockquote { + font-style: italic; + border-left: solid $faint 4px; + padding-left: 20px; + color: grey; +} + +ul { + padding: 50px; + border: 1px solid $faint; + border-radius: 10px; + + a { + text-decoration: none; + } + + li { + list-style-type: none; + } + + .date { + color: $faint; + } + .title { + padding-left: 30px; + color: $front; + text-decoration: underline; + } +} + diff --git a/template/foot.html b/template/foot.html @@ -0,0 +1,4 @@ + </div> + <footer>© laura ketola 2018</footer> + </body> +</html> diff --git a/template/head.html b/template/head.html @@ -0,0 +1,21 @@ +<!doctype html> + +<!-- + This page is generated with a simple makefile from markdown. + As a consequense, this source is not very readable. + Somewhat up-to-date source is available at + https://github.com/nindwen/nindwen.blue +--> + +<html lang="en"> + <head> + <title>nindwen</title> + <meta charset="utf-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="author" content="Laura Ketola"> + <meta name="description" content="Laura Ketola's contact page and blog."> + <link rel="shortcut icon" type="image/png" href="/66006f.png" /> + <meta name="theme-color" content="#66006f"> + <meta name="google-site-verification" content="h95iC1UVYOooJsjQ06MmTiYJLmhsc96FSkuen8NDL0k" /> + + <style> diff --git a/template/head2.html b/template/head2.html @@ -0,0 +1,7 @@ + </style> + </head> + <body> + <header> + <img src="persikka.png" alt="Header image. The word Persikka written in tengwar." /> + </header> + <div id="content"> diff --git a/template/head3.html b/template/head3.html @@ -0,0 +1,7 @@ + </style> + </head> + <body> + <header> + <a href="/">nindwen.blue</a> » <a href="/notes">notes</a> + </header> + <div id="content"> diff --git a/template/notes-template.html b/template/notes-template.html @@ -0,0 +1,41 @@ +<!DOCTYPE html> +<html> +<head> +<meta charset="utf-8" /> +<meta name="generator" content="pandoc" /> +<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> +<title>$title$</title> +$if(highlighting-css)$ +<style type="text/css"> +$highlighting-css$ +</style> +$endif$ +<link rel="stylesheet" href="/notes.css"> +<link rel="shortcut icon" type="image/png" href="/66006f.png"/> +<meta name="theme-color" content="#66006f"> +</head> +<body> +$for(include-before)$ +$include-before$ +$endfor$ +<header> +<a href="/">nindwen.blue</a> » <a href="/notes">notes</a> » $title$ +$if(date)$ +<span class="date">$date$</span> +$endif$ +</header> +$if(toc)$ +<nav id="$idprefix$TOC"> +$table-of-contents$ +</nav> +$endif$ +<div id="content"> +$body$ +</div> +$for(include-after)$ +$include-after$ +$endfor$ +<footer> +</footer> +</body> +</html>