From ef56166c811ef460baec218b445fd79f5318b138 Mon Sep 17 00:00:00 2001 From: "S.M Mukarram Nainar" Date: Wed, 2 Feb 2022 18:00:08 -0500 Subject: [PATCH 1/7] Initial SSG work --- .gitignore | 1 + README.md | 8 +- config.toml | 16 + content/_index.md | 3 + chat-with-us.md => content/chat-with-us.md | 4 +- .../play-libre-games.md | 3 + static/style.css | 438 ++++++++++++++++++ templates/base.html | 14 + templates/index.html | 5 + templates/page.html | 5 + 10 files changed, 490 insertions(+), 7 deletions(-) create mode 100644 .gitignore create mode 100644 config.toml create mode 100644 content/_index.md rename chat-with-us.md => content/chat-with-us.md (99%) rename play-libre-games.md => content/play-libre-games.md (99%) create mode 100644 static/style.css create mode 100644 templates/base.html create mode 100644 templates/index.html create mode 100644 templates/page.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..87174b6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/public/ diff --git a/README.md b/README.md index af20aa3..a2280de 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,6 @@ Welcome to the LibreGaming website repository! ## How to contribute -*libregaming.org* is built from git with pandoc. Please remember to include a licence header (e.g. CC0-1.0). Happy writing! +*libregaming.org* is built with zola. Please remember to include a licence header (e.g. CC0-1.0). Happy writing! - git checkout public - git show master:chat-with-us.md \ - | pandoc --standalone --metadata=title:'Libre Gaming' \ - > index.html - git commit -am Publish +You can build the site with `zola build`, which puts the output in `public/`, or run `zola serve` for previewing. diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..8aa9399 --- /dev/null +++ b/config.toml @@ -0,0 +1,16 @@ +# The URL the site will be built for +base_url = "https://libregaming.org" + +# Whether to automatically compile all Sass files in the sass directory +compile_sass = true + +# Whether to build a search index to be used later on by a JavaScript library +build_search_index = false + +[markdown] +# Whether to do syntax highlighting +# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola +highlight_code = false + +[extra] +# Put all your custom variables here diff --git a/content/_index.md b/content/_index.md new file mode 100644 index 0000000..ee886d2 --- /dev/null +++ b/content/_index.md @@ -0,0 +1,3 @@ ++++ ++++ +# Hi there diff --git a/chat-with-us.md b/content/chat-with-us.md similarity index 99% rename from chat-with-us.md rename to content/chat-with-us.md index ee7cfdc..7aec419 100644 --- a/chat-with-us.md +++ b/content/chat-with-us.md @@ -1,5 +1,7 @@ ++++ +title = "Chat with us!" ++++ - [Who we are](https://md.roflcopter.fr/libregaming). (WiP) # Chat with us! diff --git a/play-libre-games.md b/content/play-libre-games.md similarity index 99% rename from play-libre-games.md rename to content/play-libre-games.md index c76dea6..b2e46d9 100644 --- a/play-libre-games.md +++ b/content/play-libre-games.md @@ -1,3 +1,6 @@ ++++ +title = "Play libre games!" ++++ # Play libre games! diff --git a/static/style.css b/static/style.css new file mode 100644 index 0000000..e773d14 --- /dev/null +++ b/static/style.css @@ -0,0 +1,438 @@ +/*!**************************************************************************************************!*\ + !*** css ./node_modules/css-loader/dist/cjs.js!./node_modules/responsive-nav/responsive-nav.css ***! + \**************************************************************************************************/ +/*! responsive-nav.js 1.0.39 by @viljamis */ + +.nav-collapse ul { + margin: 0; + padding: 0; + width: 100%; + display: block; + list-style: none; +} + +.nav-collapse li { + width: 100%; + display: block; +} + +.js .nav-collapse { + clip: rect(0 0 0 0); + max-height: 0; + position: absolute; + display: block; + overflow: hidden; + zoom: 1; +} + +.nav-collapse.opened { + max-height: 9999px; +} + +.nav-toggle { + -webkit-tap-highlight-color: rgba(0,0,0,0); + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; +} + +@media screen and (min-width: 40em) { + .js .nav-collapse { + position: relative; + } + .js .nav-collapse.closed { + max-height: none; + } + .nav-toggle { + display: none; + } +} + +/*!*******************************************************************************************************************************************!*\ + !*** css ./node_modules/css-loader/dist/cjs.js!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].use[2]!./src/scss/styles.scss ***! + \*******************************************************************************************************************************************/ +* { + box-sizing: border-box; +} + +html, body { + margin: 0; + padding: 0; +} + +html body { + background-color: #1c1b22; +} + +body { + font-size: 1.25rem; + font-family: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + line-height: 1.4; + color: #dee2e6; +} + +h1, h2, h3, h4, h5, h6 { + font-family: inherit; +} + +h2 { + font-size: 2rem; +} + +p { + margin-top: 0; + margin-bottom: 1rem; +} + +a { + text-decoration: none; + color: #ff8f23; + text-decoration: underline; +} +a:hover { + color: #daf2ee; +} +a:visited { + color: #ff820a; +} +a:active { + color: #fff; +} + +.text-lightblue { + color: #b6e2ee; +} + +h1, h2, h3, h4, h5, h6, +.h1, .h2, .h3, .h4, .h5, .h6 { + margin-bottom: 5px; + font-family: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-weight: 900; + line-height: 1.4em; + color: #dee2e6; +} + +h1, .h1 { + font-size: calc(1.4375rem + 2.25vw); +} +@media (min-width: 1200px) { + h1, .h1 { + font-size: 3.125rem; + } +} + +h2, .h2 { + font-size: calc(1.375rem + 1.5vw); +} +@media (min-width: 1200px) { + h2, .h2 { + font-size: 2.5rem; + } +} + +h3, .h3 { + font-size: calc(1.34375rem + 1.125vw); +} +@media (min-width: 1200px) { + h3, .h3 { + font-size: 2.1875rem; + } +} + +h4, .h4 { + font-size: calc(1.3125rem + 0.75vw); +} +@media (min-width: 1200px) { + h4, .h4 { + font-size: 1.875rem; + } +} + +h5, .h5 { + font-size: calc(1.28125rem + 0.375vw); +} +@media (min-width: 1200px) { + h5, .h5 { + font-size: 1.5625rem; + } +} + +h6, .h6 { + font-size: 1.25rem; +} + +.lead { + font-size: calc(1.28125rem + 0.375vw); + font-weight: 300; +} +@media (min-width: 1200px) { + .lead { + font-size: 1.5625rem; + } +} + +.container { + max-width: 1200px; + margin-left: auto; + margin-right: auto; +} +@media (max-width: 78.75em) { + .container { + margin-left: 15px; + margin-right: 15px; + } +} + +.full-width-container { + max-width: 100%; + margin-left: 15px; + margin-right: 15px; +} + +.header { + width: 100%; + height: 56px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4); + background: #212529; + color: #FFF; + display: flex; + flex-direction: row; + align-items: center; + padding: 0 16px; +} +.header .brand { + margin-left: auto; + padding-left: 1em; + padding-right: 1em; + text-decoration: none; +} +.header .brand > h1 { + color: #4fbad5 !important; + display: inline-flex; + align-items: center; + font-size: calc(1.2875rem + 0.45vw); + margin: 0; +} +@media (min-width: 1200px) { + .header .brand > h1 { + font-size: 1.625rem; + } +} +.header .brand .brand-img { + margin-right: 0.5rem; +} +.header .brand .second { + color: #ff8f23 !important; +} +.header .lang-select { + display: inline-flex; + vertical-align: middle; + margin-left: auto; +} + +.header__menu-toggle { + background: none; + border: none; + width: 24px; + height: 24px; + padding: 0; + margin: 0 24px 0 0; + color: #FFF; +} + +.side-nav__content { + padding-top: 32px; + flex: 1; + list-style: none; + padding: 0; + margin: 0; + overflow-x: hidden; + overflow-y: auto; + -webkit-overflow-scrolling: touch; +} + +.side-nav__content li { + min-height: 48px; + line-height: 48px; +} + +.side-nav__content li a:hover { + background: #343a40; +} + +.nav-collapse a { + color: #dee2e6; + text-decoration: none; + width: 100%; + background: rgba(0, 0, 0, 0.7); + border-bottom: 1px solid #212529; + padding: 0.7em 1em; + float: left; +} + +.hero { + border-radius: 12px; + background: linear-gradient(to right, #159957, #155799); + min-height: 300px; + width: 100%; + color: white; + justify-content: center; + flex-direction: column; + flex-grow: 1; + padding: 1.25rem; + display: -webkit-flex; + display: flex; + -webkit-align-items: center; + align-items: center; +} +.hero > h1 { + margin: 0; +} +.hero .message { + display: -webkit-flex; + display: flex; + -webkit-justify-content: center; + justify-content: center; + -webkit-align-items: center; + align-items: center; + letter-spacing: 5px; +} + +.posts ul li { + list-style: none; + margin-bottom: calc(1.525rem + 3.3vw); +} +@media (min-width: 1200px) { + .posts ul li { + margin-bottom: 4rem; + } +} +.posts ul li a { + display: -webkit-flex; + display: flex; + text-decoration: none; +} +.posts ul { + border-top: 1px solid #495057; + padding-left: 0; + padding-right: 0; + padding-top: calc(1.625rem + 4.5vw); +} +@media (min-width: 1200px) { + .posts ul { + padding-top: 5rem; + } +} +.posts .left { + line-height: 1em; + display: -webkit-flex; + display: flex; + flex-direction: column; +} +.posts .date { + color: #4fbad5; + margin-bottom: 0.3125rem; + margin-right: 1em; + text-transform: uppercase; + font-size: calc(1.275rem + 0.3vw); +} +@media (min-width: 1200px) { + .posts .date { + font-size: 1.5rem; + } +} +.posts .year { + color: #fff; +} +.posts .title { + font-size: calc(1.325rem + 0.9vw); +} +@media (min-width: 1200px) { + .posts .title { + font-size: 2rem; + } +} +.posts .right { + line-height: 1.15em; +} +.lg-title span { + background-color: #f8f9fa; + padding-top: 0.2rem; + padding-bottom: 0.2rem; + padding-left: 1rem; + padding-right: 1rem; + border-radius: 22px; + color: #343a40 !important; + border: 3px #6c757d solid; + display: inline-flex; +} +.lg-title .icon { + margin: 0; + padding-top: 0 !important; + padding-bottom: 0 !important; +} +.lg-title .icon:before { + position: relative; + top: 0; + left: 0; + bottom: 0; + content: ""; + margin-top: -3px; + margin-bottom: -3px; + width: 64px; + margin-right: calc(1.2625rem + 0.15vw); + margin-left: -30px; + border-radius: 100%; +} +@media (min-width: 1200px) { + .lg-title .icon:before { + margin-right: 1.375rem; + } +} + +#description { + width: 100%; + display: -webkit-flex; + display: flex; + flex-direction: row; + padding: 2em; + column-gap: 20px; + border-width: 0.5em 0 0; + border-style: solid; + align-items: center; + justify-content: center; + border-image: linear-gradient(139deg, #fb8817, #ff4b01, #c12127, #e02aff) 3; + background-color: #29008a !important; + background: linear-gradient(180deg, rgba(255, 255, 255, 0.25), rgba(255, 255, 255, 0)); +} +#description .tile { + border-left: 7px solid #adb5bd; + width: 20em; + padding-left: 1.4em; + padding-right: 1.4em; + padding-bottom: 2em; + background-color: rgba(0, 0, 0, 0.9); +} +#description .tile .content { + margin: 0 auto; + max-width: 280px; +} +#description .tile .content p { + margin: 0 auto; +} + +#footer { + display: -webkit-flex; + display: flex; + justify-content: end; + margin-top: 3em; + padding: 2em 1em; +} +#footer ul li { + list-style: none; + display: inline-block; + margin-right: 0.3em; +} diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 0000000..1ea1298 --- /dev/null +++ b/templates/base.html @@ -0,0 +1,14 @@ + + + + + + Libregaming.org + + + + + {% block content %} {% endblock %} + + + diff --git a/templates/index.html b/templates/index.html new file mode 100644 index 0000000..575141f --- /dev/null +++ b/templates/index.html @@ -0,0 +1,5 @@ +{% extends "base.html" %} + +{% block content %} +{{ section.content | safe }} +{% endblock content %} diff --git a/templates/page.html b/templates/page.html new file mode 100644 index 0000000..8226656 --- /dev/null +++ b/templates/page.html @@ -0,0 +1,5 @@ +{% extends "base.html" %} + +{% block content %} +{{ page.content | safe }} +{% endblock content %} From c8c37b7e939582c4c3bc19e637d9d5654d90b178 Mon Sep 17 00:00:00 2001 From: "S.M Mukarram Nainar" Date: Wed, 2 Feb 2022 18:37:48 -0500 Subject: [PATCH 2/7] Fix spacing --- static/style.css | 5 +++++ templates/base.html | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/static/style.css b/static/style.css index e773d14..487be12 100644 --- a/static/style.css +++ b/static/style.css @@ -436,3 +436,8 @@ h6, .h6 { display: inline-block; margin-right: 0.3em; } + +img { + height: auto; + max-width: 100%; +} diff --git a/templates/base.html b/templates/base.html index 1ea1298..7b5106a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -8,7 +8,9 @@ - {% block content %} {% endblock %} +
+ {% block content %} {% endblock %} +
From eceb2f66bbcd46c6cbf0dd81ef705bb9462ba89c Mon Sep 17 00:00:00 2001 From: Phil Morrell Date: Sat, 5 Feb 2022 19:08:10 +0000 Subject: [PATCH 3/7] add SPDX-License-Identifier to zola files * confirmed intent with authors sm2n and spongycake * style.css imported from design-system, responsive-nav itself is MIT * html comment should come after doctype declaration --- config.toml | 1 + content/_index.md | 2 ++ static/style.css | 1 + templates/base.html | 1 + templates/index.html | 1 + templates/page.html | 1 + 6 files changed, 7 insertions(+) diff --git a/config.toml b/config.toml index 8aa9399..5ef59c0 100644 --- a/config.toml +++ b/config.toml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: CC0-1.0 # The URL the site will be built for base_url = "https://libregaming.org" diff --git a/content/_index.md b/content/_index.md index ee886d2..41e0104 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,3 +1,5 @@ +++ +++ + + # Hi there diff --git a/static/style.css b/static/style.css index 487be12..e416030 100644 --- a/static/style.css +++ b/static/style.css @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later */ /*!**************************************************************************************************!*\ !*** css ./node_modules/css-loader/dist/cjs.js!./node_modules/responsive-nav/responsive-nav.css ***! \**************************************************************************************************/ diff --git a/templates/base.html b/templates/base.html index 7b5106a..2ea271c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,4 +1,5 @@ + diff --git a/templates/index.html b/templates/index.html index 575141f..001b5d1 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,4 +1,5 @@ {% extends "base.html" %} + {% block content %} {{ section.content | safe }} diff --git a/templates/page.html b/templates/page.html index 8226656..a6f3670 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,4 +1,5 @@ {% extends "base.html" %} + {% block content %} {{ page.content | safe }} From a28529f02c37139388f3097b26d0e8b32bb7ec43 Mon Sep 17 00:00:00 2001 From: "S.M Mukarram Nainar" Date: Sat, 12 Feb 2022 17:40:25 -0500 Subject: [PATCH 4/7] Remove placeholder homepage --- content/_index.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 content/_index.md diff --git a/content/_index.md b/content/_index.md deleted file mode 100644 index 41e0104..0000000 --- a/content/_index.md +++ /dev/null @@ -1,5 +0,0 @@ -+++ -+++ - - -# Hi there From 50ad130e63f31d4eeb329a84a094387c8e8a5588 Mon Sep 17 00:00:00 2001 From: "S.M Mukarram Nainar" Date: Sat, 12 Feb 2022 17:41:03 -0500 Subject: [PATCH 5/7] Make about-us the homepage --- content/{about-us.md => _index.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename content/{about-us.md => _index.md} (100%) diff --git a/content/about-us.md b/content/_index.md similarity index 100% rename from content/about-us.md rename to content/_index.md From 22992d3e7b3670aa69fb84bccf1865366775aa39 Mon Sep 17 00:00:00 2001 From: "S.M Mukarram Nainar" Date: Sat, 12 Feb 2022 17:48:45 -0500 Subject: [PATCH 6/7] Relative links on on homepage --- content/_index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/_index.md b/content/_index.md index a21b151..c384191 100644 --- a/content/_index.md +++ b/content/_index.md @@ -15,10 +15,10 @@ We are just getting started. Feel free to contribute new ideas and feedback by [ [culture]: https://artlibre.org/faq_eng/ [Athenaeum]: https://gitlab.com/librebob/athenaeum [GameHub]: https://github.com/tkashkin/GameHub -[contacting us]: https://git.libregaming.org/LibreGaming/libregaming-website/src/branch/master/chat-with-us.md +[contacting us]: @/chat-with-us.md [the preliminary notes]: https://hribhrib.at:5443/upload/5035aee454f8553c88bd1f7623218485341099ed/dZSQFC3lP1lMmTQFyfLKQFBBDIC4tOrQ41Js4nzn/firstthoughts.txt -[first]: https://git.libregaming.org/LibreGaming/libregaming-website/src/branch/master/2021-08-07.md -[second]: https://git.libregaming.org/LibreGaming/libregaming-website/src/branch/master/2022-01-30.md +[first]: @/2021-08-07.md +[second]: @/2022-01-30.md # Communication @@ -85,7 +85,7 @@ For now, we do not provide any services as LibreGaming collectives. Below you wi [Our logos]: https://freedombox.emorrp1.name/_matrix/media/r0/download/freedombox.emorrp1.name/IwuxGwOfjbdjcaSLFgjqXGqa [Our first attempt at a website]: https://matrix-client.matrix.org/_matrix/media/r0/download/matrix.org/hmdmKGDlmwrCKuWnJLxGPRgJ -[play-libre-games.md]: https://git.libregaming.org/LibreGaming/libregaming-website/src/branch/master/play-libre-games.md +[play-libre-games.md]: @/play-libre-games.md [LibreGaming space screenshot on matrix]: https://freedombox.emorrp1.name/_matrix/media/r0/download/matrix.org/TqNyUvWqIgJqxIfCzaYbQGyq # External resources From bcd5a3c87b71573749f6c6bce235ebb932f9cf12 Mon Sep 17 00:00:00 2001 From: "S.M Mukarram Nainar" Date: Sat, 12 Feb 2022 17:49:21 -0500 Subject: [PATCH 7/7] Fix css link in template It can't be a relative link because the css is at the root --- templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base.html b/templates/base.html index 2ea271c..1d05098 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,7 +5,7 @@ Libregaming.org - +