diff --git a/.woodpecker.yml b/.woodpecker.yml index 165afdb..1157767 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,4 +1,10 @@ pipeline: + prepare-dev: + image: debian + commands: + - sed -i -r -e 's/queerscriptors\.org/dev\.queerscriptors\.org/g' website.lektorproject + when: + branch: dev build: image: python:3.8-bullseye commands: diff --git a/BUILDINGBLOCKS.md b/BUILDINGBLOCKS.md deleted file mode 100644 index aebd6c8..0000000 --- a/BUILDINGBLOCKS.md +++ /dev/null @@ -1,20 +0,0 @@ -Adding new projects: - -Each project is in it's own folder under contents/, like butterflysoup/, under that is then placed a file named contents.lr with this: - -``` -sort_key: X ---- -type: true ---- -title: TITLE -... -body: BODY -``` - -The sort\_key is a number signifying the projects placement from top (lower numbers) to bottom (higher numbers), it currently starts at 0 with Lucah BOAD (xx: should inverse sort such that adding new projects is easier?). -Type is a bool (that is, true or false) signifying if it the images should be on the left (true) or on the right (false). -Title is.. the title, this should (probably) be the name of the game. -Body is the small text under the title - ---- diff --git a/README.md b/README.md index 28c9875..f35b324 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,25 @@ This is the source code for the website [queerscriptors.org](https://queerscriptors.org). It uses [lektor](https://getlektor.com) -It is available from: +It is available from: - [lab.encryptionin.space](https://lab.encryptionin.space/Queerscriptors/Queerscriptors.org) (canonical) - [github](https://github.com/queerscriptors/queerscriptors.org) - [gitlab](https://gitlab.com/queerscriptors/queerscriptors.org) I am attempting to create this website without JavaScript. + +--- + +Licensing, or what is a website? +This website contains no JavaScript and has essentially no code made by myself, therefore it isn't a program, the GPL or similar licenses do not seem applicable, of course I am not a lawyer. + +I wish to use CC-BY 4.0 where applicable, or a similar license for anything it isn't applicable to. If you know anything about licensing and think this should be made better please reach out to me + +Do note: + - Not all images are made by us and are therefore, © their respective owners + - The "source code" of this website includes things made by others: + - The template is "Grayscale" by Start Bootstrap, licensed under MIT + - lektor-i18n is licensed under GPL-3.0 + - lektor-scss is licensed under MIT + - The style.CSS is based on Bootstrap (licensed under MIT), with modifications by Start Bootstrap (Also licensed under MIT), and my own changes are therefore also MIT + - The fonts: ForkAwesome is licensed under SIL OFL 1.1. Nunito is licensed under the SIL OFL 1.1. Varela Round is licensed under SIL OFL 1.1. diff --git a/TODO.md b/TODO.txt similarity index 100% rename from TODO.md rename to TODO.txt diff --git a/assets/css/styles.css b/assets/css/styles.css index a2cec1e..e91270f 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -1,5 +1,10 @@ @charset "UTF-8"; /*! +* Queerscriptors.org - Queerscriptors (https://queerscriptors.org) +* Copyright 2021-2022 Queerscriptors +* Licensed under MIT +*/ +/*! * Start Bootstrap - Grayscale v7.0.3 (https://startbootstrap.com/theme/grayscale) * Copyright 2013-2021 Start Bootstrap * Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-grayscale/blob/master/LICENSE) @@ -8138,6 +8143,19 @@ textarea.form-control-lg { border-top-left-radius: 0.25rem !important; } +@media (max-width: 575.98px) { + .rounded-top-sm { + border-top-left-radius: 0.25rem !important; + border-top-right-radius: 0.25rem !important; + } +} +@media (min-width: 575.98px) { + .rounded-start-md { + border-bottom-left-radius: 0.25rem !important; + border-top-left-radius: 0.25rem !important; + } +} + .visible { visibility: visible !important; } diff --git a/configs/i18n.ini b/configs/i18n.ini index a09058f..ca8a26d 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = cs,de,es,es_419,fr,id,pl,pt,pt_BR,ru +translations = cs,de,es,fr,id,pl,pt,pt_BR,ru i18npath = i18n translate_paragraphwise = False url_prefix = https://queerscriptors.org/ diff --git a/content/games/error143/contents.lr b/content/games/error143/contents.lr new file mode 100644 index 0000000..6fe6358 --- /dev/null +++ b/content/games/error143/contents.lr @@ -0,0 +1,18 @@ +_model: project +--- +ogpimage: main.png +--- +title: ERROR143 +--- +shortbody: A fully voiced bickering and bantering rivals-to-lovers visual novel +--- +body: +A bickering and bantering rivals-to-lovers hacking game! + +Your rival just bested you in a hacking competition. Were you going to be a sane person and let that slide? HECK NO! You hack into his database and leave him a little message, proving your superiority. + +--but what's this? He's hacked you back? + +Well, two can play this game. +--- +website: https://jennyvipham.itch.io/error143 \ No newline at end of file diff --git a/content/games/error143/main.png b/content/games/error143/main.png new file mode 100644 index 0000000..c5c80e0 Binary files /dev/null and b/content/games/error143/main.png differ diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 8b17dff..6a28f0c 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -12,11 +12,7 @@ language = Deutsch (de) [es] url = /es/ -language = Español (España) (es) - -[es_419] -url = /es_419/ -language = Español (es_419) +language = Español (es) [fr] language = Français (fr) diff --git a/models/about.ini b/models/about.ini index 17aa602..b974007 100644 --- a/models/about.ini +++ b/models/about.ini @@ -9,12 +9,12 @@ translate = False [fields.intro] type = markdown -translate = True +translate = False [fields.transl] type = markdown -translate = True +translate = False [fields.devs] type = markdown -translate = True +translate = False diff --git a/templates/games.html b/templates/games.html index 4f8aa86..34394a5 100644 --- a/templates/games.html +++ b/templates/games.html @@ -14,7 +14,7 @@
- +
diff --git a/templates/joinus.html b/templates/joinus.html index bb6a72a..e24672d 100644 --- a/templates/joinus.html +++ b/templates/joinus.html @@ -5,6 +5,7 @@

{{ this.join_title }}

Discord + Matrix Weblate
diff --git a/templates/layout.html b/templates/layout.html index e3c186c..310db33 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -4,7 +4,7 @@ - + @@ -31,6 +31,6 @@ {% block page %}{% endblock %} -{% include 'footer.html' %} +{% include 'footer.html' %} diff --git a/website.lektorproject b/website.lektorproject index 6952d95..faba74f 100644 --- a/website.lektorproject +++ b/website.lektorproject @@ -25,11 +25,6 @@ name = Spanish url_prefix = /es/ locale = es -[alternatives.es_419] -name = LatAmSpanish -url_prefix = /es_419/ -locale = es_419 - [alternatives.fr] name = French url_prefix = /fr/