diff --git a/meme.html b/meme.html new file mode 100644 index 0000000..7a0b5b4 --- /dev/null +++ b/meme.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/owl.png b/owl.png new file mode 100644 index 0000000..0d668a4 Binary files /dev/null and b/owl.png differ diff --git a/owl2.png b/owl2.png new file mode 100644 index 0000000..00cf44b Binary files /dev/null and b/owl2.png differ diff --git a/poetry.pdf b/poetry.pdf new file mode 100644 index 0000000..d3a175e Binary files /dev/null and b/poetry.pdf differ diff --git a/res/common.css b/res/common.css index aa24f8d..2ac40e2 100644 --- a/res/common.css +++ b/res/common.css @@ -2,6 +2,7 @@ body { display: block; margin: 0; font-family: sans-serif; + line-height: 1.42857143; } nav { diff --git a/responsive.png b/responsive.png new file mode 100644 index 0000000..749e6c6 Binary files /dev/null and b/responsive.png differ diff --git a/responsive2.png b/responsive2.png new file mode 100644 index 0000000..a7d5a2f Binary files /dev/null and b/responsive2.png differ diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000..702fec0 Binary files /dev/null and b/screenshot.png differ diff --git a/song.html b/song.html new file mode 100644 index 0000000..0aff235 --- /dev/null +++ b/song.html @@ -0,0 +1,7 @@ + + + + +playlist + + diff --git a/templates/html-generator b/templates/html-generator index af27fc6..12d9f9c 160000 --- a/templates/html-generator +++ b/templates/html-generator @@ -1 +1 @@ -Subproject commit af27fc6304ae0a6b9b70afc242bf4e0a031b88ba +Subproject commit 12d9f9c59904f2e9707d5319ff351250280b6532 diff --git a/templates/src/Templates.hs b/templates/src/Templates.hs index 687bd10..b969bb0 100644 --- a/templates/src/Templates.hs +++ b/templates/src/Templates.hs @@ -21,6 +21,8 @@ basePage pageTitle authorName content = %> (title %>> pageTitle) %> viewport %> (newTag "script" %% ("async", "async") %% ("src", resUrl ++ "common.js")) + %> blockAllMixedContent + %> cspMeta "default-src 'none'; style-src 'self'; img-src 'self' https://stackexchange.com; script-src 'self';" ) %> content diff --git a/templates/src/Templates/Icons.hs b/templates/src/Templates/Icons.hs index bca0af0..57924f1 100644 --- a/templates/src/Templates/Icons.hs +++ b/templates/src/Templates/Icons.hs @@ -27,7 +27,7 @@ ccbysaIconUrl :: String ccbysaIconUrl = resUrl ++ "cc-by-sa-small.png" ccbysaIcon :: Html -ccbysaIcon = img "This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License" ccbysaIconUrl %% ("style", "border-width:0") +ccbysaIcon = img "This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License" ccbysaIconUrl license :: Html license = diff --git a/templates/templates.cabal b/templates/templates.cabal index 97ae233..beff090 100644 --- a/templates/templates.cabal +++ b/templates/templates.cabal @@ -2,12 +2,12 @@ name: templates version: 0.1.0.0 -- synopsis: -- description: -homepage: https://github.com/lijerom/lijero.co/ +homepage: https://github.com/lijerom/jtmar.me license: GPL-3 --license-file: LICENSE -author: Lijero -maintainer: lijero@lijero.co -copyright: 2018 Lijero +author: James Martin +maintainer: james@jtmar.me +copyright: 2018 James Martin category: Web build-type: Simple cabal-version: >=1.10