%%TITLE%%

From ce927cf1ccf5bc6ddce116d9ad03be43117ca464 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 28 May 2022 18:51:26 +0100 Subject: move html related content to htmlextras --- README.md | 2 +- footer.html.part | 7 --- gemtexter.conf | 6 +-- header.html.part | 9 ---- htmlextras/footer.html.part | 7 +++ htmlextras/header.html.part | 9 ++++ htmlextras/style.css | 111 ++++++++++++++++++++++++++++++++++++++++++ htmlextras/style1.css | 75 +++++++++++++++++++++++++++++ htmlextras/style2.css | 111 ++++++++++++++++++++++++++++++++++++++++++ htmlextras/style3.css | 115 ++++++++++++++++++++++++++++++++++++++++++++ lib/generate.source.sh | 3 +- style.css | 111 ------------------------------------------ style1.css | 75 ----------------------------- style2.css | 111 ------------------------------------------ style3.css | 115 -------------------------------------------- 15 files changed, 434 insertions(+), 433 deletions(-) delete mode 100644 footer.html.part delete mode 100644 header.html.part create mode 100644 htmlextras/footer.html.part create mode 100644 htmlextras/header.html.part create mode 100644 htmlextras/style.css create mode 100644 htmlextras/style1.css create mode 100644 htmlextras/style2.css create mode 100644 htmlextras/style3.css delete mode 100644 style.css delete mode 100644 style1.css delete mode 100644 style2.css delete mode 100644 style3.css diff --git a/README.md b/README.md index a41fdb8..f093b2b 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Whereas you only want to edit the content in the `gemtext` folder directly. The ### Special HTML configuration -You will find the `./header.html.part` and `./footer.html.part` files, they are minimal template files for the HTML generation. There's also the `style.css` for HTML. +You will find the `./htmlextras/header.html.part` and `./htmlextras/footer.html.part` files, they are minimal template files for the HTML generation. There's also the `./htmlextras/style.css` for HTML. ### Special HTML configuration diff --git a/footer.html.part b/footer.html.part deleted file mode 100644 index 997364c..0000000 --- a/footer.html.part +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/gemtexter.conf b/gemtexter.conf index ea808b5..57a77cb 100644 --- a/gemtexter.conf +++ b/gemtexter.conf @@ -5,6 +5,6 @@ declare -xr EMAIL='comments@mx.buetow.org' declare -xr IMAGE_PATTERN='\.(jpg|png|gif)$' declare -xr ATOM_MAX_ENTRIES=42 declare -xr CONTENT_BASE_DIR=../foo.zone-content -declare -xr HTML_HEADER=./header.html.part -declare -xr HTML_FOOTER=./footer.html.part -declare -xr HTML_CSS_STYLE=./style.css +declare -xr HTML_HEADER=./htmlextras/header.html.part +declare -xr HTML_FOOTER=./htmlextras/footer.html.part +declare -xr HTML_CSS_STYLE=./htmlextras/style.css diff --git a/header.html.part b/header.html.part deleted file mode 100644 index f2592b3..0000000 --- a/header.html.part +++ /dev/null @@ -1,9 +0,0 @@ - - - - -%%TITLE%% - - - - diff --git a/htmlextras/footer.html.part b/htmlextras/footer.html.part new file mode 100644 index 0000000..997364c --- /dev/null +++ b/htmlextras/footer.html.part @@ -0,0 +1,7 @@ + + + diff --git a/htmlextras/header.html.part b/htmlextras/header.html.part new file mode 100644 index 0000000..f2592b3 --- /dev/null +++ b/htmlextras/header.html.part @@ -0,0 +1,9 @@ + + + + +%%TITLE%% + + + + diff --git a/htmlextras/style.css b/htmlextras/style.css new file mode 100644 index 0000000..0f23916 --- /dev/null +++ b/htmlextras/style.css @@ -0,0 +1,111 @@ +* { + line-height: 1.5em; + margin: 0; + padding: 0; + background-color: #f8f8f8; + color: #222; +} + +body { + font: normal 14px monospace; + width: 99%; + max-width: 800px; + margin: 2em auto 0; + padding: 0 20px; + display: block; +} + +h1, h2, h3 { + font-weight: bold; + margin-top: 1em; + margin-bottom: 0.75em; +} + +h1 { + font-size: 1.5em; +} + +h2 { + font-size: 1.25em; +} + +h3 { + font-size: 1.0em; +} + +a { + color: #248; + font-weight: 600; + text-decoration: none; +} + +a:hover { + background-color: #9CFF00; + text-decoration: underline; +} + +a:visited { + color: #248; +} + +a.textlink:before { + content: "⇒ "; + padding-left: 11px; +} + +p.quote { + font-style: italic; +} + +p.quote:before { + content: "« "; + padding-left: 2px; +} + +p.quote:after { + content: " »"; + padding-right: 2px; +} + +p { + margin: 0.75em 0 0.75em 0; + padding: 0 5px; +} + +ol { + margin: 0.75em 0 0.75em 0; + padding: 0; +} + +ul { + list-style: none; + padding-right: 23px; + padding-left: 10px; + margin: 0.75em 0 0.75em 0; +} + +li { + margin-left: 1em; + margin-bottom: 0.25em; +} + +li:before { + content: "★"; + padding-right: 5px; +} + +img { + max-width: 100%; + display: block; + margin: auto; + border: 1px solid #9CFF00; +} + +pre { + font-family: monospace; + padding: 0; + overflow-x: scroll; + scrollbar-width: none; + border-left: 2px solid #9CFF00; + padding-left: 12px; +} diff --git a/htmlextras/style1.css b/htmlextras/style1.css new file mode 100644 index 0000000..956541d --- /dev/null +++ b/htmlextras/style1.css @@ -0,0 +1,75 @@ +body { + margin: auto; + padding-left: 10px; + padding-right: 10px; + max-width: 900px; + background-color: #37585E; + color: #ddddce; + font-family: Courier New, Courier, Lucida Sans Typewriter, Lucida Typewriter, monospace; + font-style: normal; + font-variant: normal; +} + +h1 { + color: #ffffff; +} + +h2 { + color: #ffffef; +} + +h3 { + color: #eeeede; +} + +a { + color: #99ccff; + text-decoration: none; +} + +a:hover { + color: #55bc90; + text-decoration: underline; +} + +li { + color: #99ccff; +} + +img { + max-width: 600px; + max-height: 400px; + display: block; + margin: auto; +} + +pre { + display: block; + background-color: #111; + color: #bbbfaf; + padding: 5px; + overflow-x: auto; +} + +a.textlink:before { + content: " ⇒ "; + padding-left: 11px; +} + +p.quote { + color: cyan; +} + +p.footer { + color: #ffa500; +} + +p.quote:before { + content: " « "; + padding-left: 2px; +} + +p.quote:after { + content: " » "; + padding-right: 2px; +} diff --git a/htmlextras/style2.css b/htmlextras/style2.css new file mode 100644 index 0000000..0f23916 --- /dev/null +++ b/htmlextras/style2.css @@ -0,0 +1,111 @@ +* { + line-height: 1.5em; + margin: 0; + padding: 0; + background-color: #f8f8f8; + color: #222; +} + +body { + font: normal 14px monospace; + width: 99%; + max-width: 800px; + margin: 2em auto 0; + padding: 0 20px; + display: block; +} + +h1, h2, h3 { + font-weight: bold; + margin-top: 1em; + margin-bottom: 0.75em; +} + +h1 { + font-size: 1.5em; +} + +h2 { + font-size: 1.25em; +} + +h3 { + font-size: 1.0em; +} + +a { + color: #248; + font-weight: 600; + text-decoration: none; +} + +a:hover { + background-color: #9CFF00; + text-decoration: underline; +} + +a:visited { + color: #248; +} + +a.textlink:before { + content: "⇒ "; + padding-left: 11px; +} + +p.quote { + font-style: italic; +} + +p.quote:before { + content: "« "; + padding-left: 2px; +} + +p.quote:after { + content: " »"; + padding-right: 2px; +} + +p { + margin: 0.75em 0 0.75em 0; + padding: 0 5px; +} + +ol { + margin: 0.75em 0 0.75em 0; + padding: 0; +} + +ul { + list-style: none; + padding-right: 23px; + padding-left: 10px; + margin: 0.75em 0 0.75em 0; +} + +li { + margin-left: 1em; + margin-bottom: 0.25em; +} + +li:before { + content: "★"; + padding-right: 5px; +} + +img { + max-width: 100%; + display: block; + margin: auto; + border: 1px solid #9CFF00; +} + +pre { + font-family: monospace; + padding: 0; + overflow-x: scroll; + scrollbar-width: none; + border-left: 2px solid #9CFF00; + padding-left: 12px; +} diff --git a/htmlextras/style3.css b/htmlextras/style3.css new file mode 100644 index 0000000..d62b6ae --- /dev/null +++ b/htmlextras/style3.css @@ -0,0 +1,115 @@ +body { + margin: auto; + padding-left: 11px; + padding-right: 11px; + background-color: #8fbc8f; + color: #ddddce; + font-family: Courier New, Courier, Lucida Sans Typewriter, Lucida Typewriter, monospace; + font-style: normal; + font-variant: normal; + max-width: 900px; +} + +h1 { + padding-top: 23px; + padding-bottom: 23px; + padding-left: 11px; + color: #ffffff; + background-color: #000000; + text-decoration: underline; + margin-left: -23px; + max-width: 878px; +} + +h2 { + padding-top: 23px; + padding-bottom: 23px; + padding-left: 11px; + color: #ffffff; + background-color: #000000; + text-decoration: underline; + margin-left: -11px; + max-width: 889px; +} + +h3 { + padding-top: 23px; + padding-bottom: 23px; + padding-left: 11px; + color: #ffffff; + background-color: #000000; + text-decoration: underline; + margin-left: -5px; + max-width: 895px; +} + +a { + color: #ffffff; + text-decoration: none; + background-color: #000000; + padding: 2px; + margin: 2px; +} + +a:hover { + color: #000000; + text-decoration: underline; + background-color: #ffffff; +} + +ul { + color: #ffffff; + background-color: #000000; + padding-top: 23px; + padding-bottom: 23px; + padding-right: 23px; + padding-left: 79px; +} + +img { + max-width: 601; + max-height: 401; + display: block; + margin: auto; +} + +pre { + display: block; + overflow-x: auto; + color: #ffffff; + background-color: #000000; + margin: 5px; + padding: 23px; + border: 29px double #8fbc8f; +} + +a.textlink:before { + content: " ⇒ "; + padding-left: 11px; +} + +p { + color: #ffffff; + background-color: #000000; + padding: 23px; +} + +p.quote { + color: #ffffff; + background-color: #000000; +} + +p.footer { + color: #ffffff; + background-color: #000000; +} + +p.quote:before { + content: " « "; + padding-left: 2px; +} + +p.quote:after { + content: " » "; + padding-right: 2px; +} diff --git a/lib/generate.source.sh b/lib/generate.source.sh index dedbe31..4f40101 100644 --- a/lib/generate.source.sh +++ b/lib/generate.source.sh @@ -137,7 +137,7 @@ generate::fromgmi () { for format in "$@"; do generate::fromgmi_add_docs "$src" "$format" & done - done < <(find "$CONTENT_BASE_DIR/gemtext" -type f | $GREP -E -v '(\.git.*|\.gmi|atom.xml|\.tmp)$') + done < <(find "$CONTENT_BASE_DIR/gemtext" -type f | $GREP -E -v '(\.git.*|\.gmi|atom.xml|\.tmp|style.css)$') wait log INFO "Added $num_doc_files other documents to each of $*" @@ -156,6 +156,7 @@ generate::fromgmi () { done & done wait + rm $CONTENT_BASE_DIR/gemtext/style.css if [[ -z "$GIT_COMMIT_MESSAGE" ]]; then GIT_COMMIT_MESSAGE='Publishing new version' diff --git a/style.css b/style.css deleted file mode 100644 index 0f23916..0000000 --- a/style.css +++ /dev/null @@ -1,111 +0,0 @@ -* { - line-height: 1.5em; - margin: 0; - padding: 0; - background-color: #f8f8f8; - color: #222; -} - -body { - font: normal 14px monospace; - width: 99%; - max-width: 800px; - margin: 2em auto 0; - padding: 0 20px; - display: block; -} - -h1, h2, h3 { - font-weight: bold; - margin-top: 1em; - margin-bottom: 0.75em; -} - -h1 { - font-size: 1.5em; -} - -h2 { - font-size: 1.25em; -} - -h3 { - font-size: 1.0em; -} - -a { - color: #248; - font-weight: 600; - text-decoration: none; -} - -a:hover { - background-color: #9CFF00; - text-decoration: underline; -} - -a:visited { - color: #248; -} - -a.textlink:before { - content: "⇒ "; - padding-left: 11px; -} - -p.quote { - font-style: italic; -} - -p.quote:before { - content: "« "; - padding-left: 2px; -} - -p.quote:after { - content: " »"; - padding-right: 2px; -} - -p { - margin: 0.75em 0 0.75em 0; - padding: 0 5px; -} - -ol { - margin: 0.75em 0 0.75em 0; - padding: 0; -} - -ul { - list-style: none; - padding-right: 23px; - padding-left: 10px; - margin: 0.75em 0 0.75em 0; -} - -li { - margin-left: 1em; - margin-bottom: 0.25em; -} - -li:before { - content: "★"; - padding-right: 5px; -} - -img { - max-width: 100%; - display: block; - margin: auto; - border: 1px solid #9CFF00; -} - -pre { - font-family: monospace; - padding: 0; - overflow-x: scroll; - scrollbar-width: none; - border-left: 2px solid #9CFF00; - padding-left: 12px; -} diff --git a/style1.css b/style1.css deleted file mode 100644 index 956541d..0000000 --- a/style1.css +++ /dev/null @@ -1,75 +0,0 @@ -body { - margin: auto; - padding-left: 10px; - padding-right: 10px; - max-width: 900px; - background-color: #37585E; - color: #ddddce; - font-family: Courier New, Courier, Lucida Sans Typewriter, Lucida Typewriter, monospace; - font-style: normal; - font-variant: normal; -} - -h1 { - color: #ffffff; -} - -h2 { - color: #ffffef; -} - -h3 { - color: #eeeede; -} - -a { - color: #99ccff; - text-decoration: none; -} - -a:hover { - color: #55bc90; - text-decoration: underline; -} - -li { - color: #99ccff; -} - -img { - max-width: 600px; - max-height: 400px; - display: block; - margin: auto; -} - -pre { - display: block; - background-color: #111; - color: #bbbfaf; - padding: 5px; - overflow-x: auto; -} - -a.textlink:before { - content: " ⇒ "; - padding-left: 11px; -} - -p.quote { - color: cyan; -} - -p.footer { - color: #ffa500; -} - -p.quote:before { - content: " « "; - padding-left: 2px; -} - -p.quote:after { - content: " » "; - padding-right: 2px; -} diff --git a/style2.css b/style2.css deleted file mode 100644 index 0f23916..0000000 --- a/style2.css +++ /dev/null @@ -1,111 +0,0 @@ -* { - line-height: 1.5em; - margin: 0; - padding: 0; - background-color: #f8f8f8; - color: #222; -} - -body { - font: normal 14px monospace; - width: 99%; - max-width: 800px; - margin: 2em auto 0; - padding: 0 20px; - display: block; -} - -h1, h2, h3 { - font-weight: bold; - margin-top: 1em; - margin-bottom: 0.75em; -} - -h1 { - font-size: 1.5em; -} - -h2 { - font-size: 1.25em; -} - -h3 { - font-size: 1.0em; -} - -a { - color: #248; - font-weight: 600; - text-decoration: none; -} - -a:hover { - background-color: #9CFF00; - text-decoration: underline; -} - -a:visited { - color: #248; -} - -a.textlink:before { - content: "⇒ "; - padding-left: 11px; -} - -p.quote { - font-style: italic; -} - -p.quote:before { - content: "« "; - padding-left: 2px; -} - -p.quote:after { - content: " »"; - padding-right: 2px; -} - -p { - margin: 0.75em 0 0.75em 0; - padding: 0 5px; -} - -ol { - margin: 0.75em 0 0.75em 0; - padding: 0; -} - -ul { - list-style: none; - padding-right: 23px; - padding-left: 10px; - margin: 0.75em 0 0.75em 0; -} - -li { - margin-left: 1em; - margin-bottom: 0.25em; -} - -li:before { - content: "★"; - padding-right: 5px; -} - -img { - max-width: 100%; - display: block; - margin: auto; - border: 1px solid #9CFF00; -} - -pre { - font-family: monospace; - padding: 0; - overflow-x: scroll; - scrollbar-width: none; - border-left: 2px solid #9CFF00; - padding-left: 12px; -} diff --git a/style3.css b/style3.css deleted file mode 100644 index d62b6ae..0000000 --- a/style3.css +++ /dev/null @@ -1,115 +0,0 @@ -body { - margin: auto; - padding-left: 11px; - padding-right: 11px; - background-color: #8fbc8f; - color: #ddddce; - font-family: Courier New, Courier, Lucida Sans Typewriter, Lucida Typewriter, monospace; - font-style: normal; - font-variant: normal; - max-width: 900px; -} - -h1 { - padding-top: 23px; - padding-bottom: 23px; - padding-left: 11px; - color: #ffffff; - background-color: #000000; - text-decoration: underline; - margin-left: -23px; - max-width: 878px; -} - -h2 { - padding-top: 23px; - padding-bottom: 23px; - padding-left: 11px; - color: #ffffff; - background-color: #000000; - text-decoration: underline; - margin-left: -11px; - max-width: 889px; -} - -h3 { - padding-top: 23px; - padding-bottom: 23px; - padding-left: 11px; - color: #ffffff; - background-color: #000000; - text-decoration: underline; - margin-left: -5px; - max-width: 895px; -} - -a { - color: #ffffff; - text-decoration: none; - background-color: #000000; - padding: 2px; - margin: 2px; -} - -a:hover { - color: #000000; - text-decoration: underline; - background-color: #ffffff; -} - -ul { - color: #ffffff; - background-color: #000000; - padding-top: 23px; - padding-bottom: 23px; - padding-right: 23px; - padding-left: 79px; -} - -img { - max-width: 601; - max-height: 401; - display: block; - margin: auto; -} - -pre { - display: block; - overflow-x: auto; - color: #ffffff; - background-color: #000000; - margin: 5px; - padding: 23px; - border: 29px double #8fbc8f; -} - -a.textlink:before { - content: " ⇒ "; - padding-left: 11px; -} - -p { - color: #ffffff; - background-color: #000000; - padding: 23px; -} - -p.quote { - color: #ffffff; - background-color: #000000; -} - -p.footer { - color: #ffffff; - background-color: #000000; -} - -p.quote:before { - content: " « "; - padding-left: 2px; -} - -p.quote:after { - content: " » "; - padding-right: 2px; -} -- cgit v1.2.3