From 1beba945c35492dabbd40e19dff6065435de2aa5 Mon Sep 17 00:00:00 2001 From: Ash Monty Date: Sun, 12 Dec 2021 20:51:59 +0100 Subject: [PATCH 01/12] fix: animation jumping --- public/assets/css/main.css | 23 +++++++++-------------- src/routers/home.js | 6 +++--- views/home.handlebars | 11 ----------- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/public/assets/css/main.css b/public/assets/css/main.css index c81191e..a1244b3 100644 --- a/public/assets/css/main.css +++ b/public/assets/css/main.css @@ -492,7 +492,7 @@ section.team-helpers .text { } section.team-helpers .team-helpers-cards { display: inline-grid; - grid-template-columns: repeat(6, 1fr); + grid-template-columns: repeat(9, 1fr); grid-gap: 20px; margin-right: 20px; color: var(--text-secondary); @@ -530,11 +530,11 @@ section.team-helpers .helper-card { padding: 14px 24px; background: #16192D; border-radius: 12px; - animation: scrollHelpersRTL 30s linear infinite; + animation: scrollHelpersRTL 45s linear infinite; min-width: 480px; } section.team-helpers .row.second .helper-card { - animation: scrollHelpersLTR 30s linear infinite; + animation: scrollHelpersLTR 45s linear infinite; } section.team-helpers .helper-card:hover { background: #252A51; @@ -545,12 +545,12 @@ section.team-helpers .helper-card:hover { transform: translatex(0%); } 100% { - transform: translateX(calc( ( ( 100% + 20px ) * -6 ) + -7px)); /* Don't question this, it just works. */ + transform: translateX(calc( ( ( 100% + 20px ) * -9 ) + -7px)); /* Don't question this, it just works. */ } } @keyframes scrollHelpersLTR { 0% { - transform: translateX(calc( ( ( 100% + 20px ) * -6 ) + -7px)); + transform: translateX(calc( ( ( 100% + 20px ) * -9 ) + -7px)); } 100% { transform: translatex(0%); @@ -592,11 +592,6 @@ section.team-helpers .helper-card span { section.team-helpers .helper-card p { color: var(--text-secondary); } -/* These two fix the spacing being inconsistent on some card, thus "jumping" on repeat. I'm fairly certain it isn't my fault */ -section.team-helpers .row.first .team-helpers-cards.repeat.first a:nth-child(3){ - position: relative; - left: 5px; -} section.update-signup { position: relative; @@ -1074,22 +1069,22 @@ footer div.discord-server-card svg { margin-top: 12px; } section.team-helpers .helper-card { - animation: scrollHelpersRTLMobile 25s linear infinite; + animation: scrollHelpersRTLMobile 45s linear infinite; } section.team-helpers .row.second .helper-card { - animation: scrollHelpersLTRMobile 25s linear infinite; + animation: scrollHelpersLTRMobile 45s linear infinite; } @keyframes scrollHelpersRTLMobile { 0% { transform: translatex(0%); } 100% { - transform: translateX(calc( ( ( 100% + 12px ) * -6 ) + -6px)); + transform: translateX(calc( ( ( 100% + 12px ) * -9 ) + -6px)); } } @keyframes scrollHelpersLTRMobile { 0% { - transform: translateX(calc( ( ( 100% + 12px ) * -6 ) + -6px)); + transform: translateX(calc( ( ( 100% + 12px ) * -9 ) + -6px)); } 100% { transform: translatex(0%); diff --git a/src/routers/home.js b/src/routers/home.js index 3985122..b244b52 100644 --- a/src/routers/home.js +++ b/src/routers/home.js @@ -28,10 +28,10 @@ router.get('/', async (request, response) => { const specialThanksFirstRow = specialThanksPeople.slice(0, 3); const specialThanksSecondRow = specialThanksPeople.slice(3, 6); - // Builds the final array to be sent to the view, and duplicates each row. + // Builds the final array to be sent to the view, and triples each row. specialThanksPeople = { - first: specialThanksFirstRow.concat(specialThanksFirstRow), - second: specialThanksSecondRow.concat(specialThanksSecondRow) + first: specialThanksFirstRow.concat(specialThanksFirstRow).concat(specialThanksFirstRow), + second: specialThanksSecondRow.concat(specialThanksSecondRow).concat(specialThanksFirstRow) }; response.render('home', { diff --git a/views/home.handlebars b/views/home.handlebars index 81bbfec..07c56eb 100644 --- a/views/home.handlebars +++ b/views/home.handlebars @@ -211,17 +211,6 @@ {{/each}} -
- {{#each specialThanksPeople.second}} - -
- -
- {{ name }} -

{{ caption }}

-
- {{/each}} -
From c502881ee6c92d9bbd9a8b4925af85d4347ae12a Mon Sep 17 00:00:00 2001 From: Ash Monty Date: Sun, 12 Dec 2021 23:43:42 +0100 Subject: [PATCH 02/12] chore: hide links to docs section --- views/partials/footer.handlebars | 2 +- views/partials/header.handlebars | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/views/partials/footer.handlebars b/views/partials/footer.handlebars index 26ae647..6490167 100644 --- a/views/partials/footer.handlebars +++ b/views/partials/footer.handlebars @@ -35,7 +35,7 @@

Useful links

- Docs + Docs FAQ Progress Blog diff --git a/views/partials/header.handlebars b/views/partials/header.handlebars index 012690b..d54f986 100644 --- a/views/partials/header.handlebars +++ b/views/partials/header.handlebars @@ -28,7 +28,7 @@ {{ localeHelper locale "nav" "about" }} {{ localeHelper locale "nav" "faq" }} {{ localeHelper locale "nav" "credits" }} - {{ localeHelper locale "nav" "docs"}} + {{ localeHelper locale "nav" "docs"}} {{ localeHelper locale "nav" "progress"}} {{ localeHelper locale "nav" "blog" }} From e4cf65885df6ef3f7f3d62b74f9d331295df258c Mon Sep 17 00:00:00 2001 From: Ash Monty Date: Sun, 12 Dec 2021 23:44:45 +0100 Subject: [PATCH 03/12] feat: add Ko-fi link in footer --- views/partials/footer.handlebars | 1 + 1 file changed, 1 insertion(+) diff --git a/views/partials/footer.handlebars b/views/partials/footer.handlebars index 6490167..e276407 100644 --- a/views/partials/footer.handlebars +++ b/views/partials/footer.handlebars @@ -30,6 +30,7 @@

Socials

Twitter Patreon + Ko-fi Discord GitHub
From 3a9a91dbb1e4ebbd4def8d7db842742650e6927a Mon Sep 17 00:00:00 2001 From: Ash Monty Date: Sun, 12 Dec 2021 23:45:27 +0100 Subject: [PATCH 04/12] chore: update SVGs for quick links, add text to locale.json --- locales/US_en.json | 15 ++++++++++++++- views/docs/docs.handlebars | 16 +++++++--------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/locales/US_en.json b/locales/US_en.json index c058455..c277db5 100644 --- a/locales/US_en.json +++ b/locales/US_en.json @@ -180,6 +180,19 @@ "button": "Test file" }, "docs": { - "missingInLocale": "This page is unavailable in your locale. Please check the English version below." + "missingInLocale": "This page is unavailable in your locale. Please check the English version below.", + "quickLinks": { + "header": "Quick links", + "links": [ + { + "header": "Installing Pretendo", + "caption": "View the setup instructions" + }, + { + "header": "Got an error?", + "caption": "Search for it here" + } + ] + } } } \ No newline at end of file diff --git a/views/docs/docs.handlebars b/views/docs/docs.handlebars index d5b7c12..584b518 100644 --- a/views/docs/docs.handlebars +++ b/views/docs/docs.handlebars @@ -38,22 +38,20 @@ {{/if}} {{#if showQuickLinks}} -

Quick links

+

{{ localeHelper locale "docs" "quickLinks" "header" }}