From 39a51533af566c250d3b065489f8df6fe8e82b95 Mon Sep 17 00:00:00 2001 From: floss4good Date: Tue, 6 Feb 2024 02:07:06 +0200 Subject: [PATCH 1/3] style: Make footer look the same as in grav-theme-disroot Refs: /Disroot-themes/grav-theme-disroot/pulls/75/ --- css/media-queries.css | 6 ++ css/style.css | 89 +++++++++++++++++++++-------- languages.yaml | 14 ++--- templates/partials/footer.html.twig | 20 ++++--- 4 files changed, 89 insertions(+), 40 deletions(-) diff --git a/css/media-queries.css b/css/media-queries.css index 10dc4a6..4d241c6 100644 --- a/css/media-queries.css +++ b/css/media-queries.css @@ -14,9 +14,15 @@ padding-right: 5px; } + footer #footer-links { + text-align: center; + width: 100%; + } + /* Icons */ footer #footer-icons { display: none; } footer #footer-logo { display: none; } + footer #footer-left { display: none; } /* Go To Top Button */ #go-top { margin-left: -22px; } diff --git a/css/style.css b/css/style.css index 50b8574..68827ab 100644 --- a/css/style.css +++ b/css/style.css @@ -1729,19 +1729,46 @@ footer { justify-content: center; text-align: center; align-items: center; - height: 82px; } footer #footer-logo { - height: 45px; - width: 15%; - background: url("../images/d-white.png") no-repeat left center; - background-size: 40px 40px; - margin-left: 30px; + background: url("../images/d-white.png") no-repeat center; + background-size: contain; + margin-bottom: 0; + margin-left: 1dvw; opacity: 0.7; - display: inline-block; } +footer #footer-left { + display: flex; + width: 150px; + background: transparent; + align-items: center; + margin-left: 10px; +} + +#footer-copyleft { + background: url("https://disroot.org/user/themes/disroot/images/by-sa.png") no-repeat center; + background-size: contain; + margin-bottom: 0; + margin-left: 1dvw; + opacity: 0.7; +} + +#footer-logo a { + display: flex; + width: 45px; + height: 45px; + margin-bottom: 0; +} + +#footer-copyleft a { + display: flex; + width: 120px; + height: 40px; + margin-bottom: 0; +} + footer .dot { height: 5px; width: 5px; @@ -1753,28 +1780,40 @@ footer { footer #footer-links { text-align: center; - width: 60%; + width: calc(100% - 300px); } footer ul.footer-links { display: flex; - justify-content: center; + justify-content: space-evenly; align-items: center; - padding-left: 0; + padding-left: 10%; + padding-right: 10%; margin-bottom: 24px; margin-top: 12px; } - footer ul.footer-icons { - display: flex; - justify-content: end; - margin-right: 30px; - align-items: center; - } +footer ul.footer-icons-left { + display: inline-flex; + width: 100%; + justify-content: left; + align-items: center; + margin: 0; + padding: 0; +} + +footer ul.footer-icons-right{ + display: inline-flex; + width: 100%; + justify-content: right; + align-items: center; + margin: 0; + padding: 0; +} footer div#footer-links ul li { - padding-left: 20px; - padding-right: 20px; + padding-left: 8px; + padding-right: 8px; margin: 0; padding-top: 13px; font-weight: 600; @@ -1790,25 +1829,25 @@ footer { } footer #footer-icons { - width: 25%; + width: 150px; background: transparent; margin-left: auto; - margin-right: auto; + margin-right: 10px; text-align: center; - margin-bottom: 24px; - margin-top: 12px; } footer #footer-icons ul li { margin: 0; - padding-right: 10px; - padding-top: 10px; - text-align: right; + margin-right: 1dvw;; + text-align: center; } footer #footer-icons ul li .fa-fw { + display: flex; color: white; opacity: 0.7; + height: 45px; + align-items: center; } footer #footer-icons ul li .fa-fw:hover { diff --git a/languages.yaml b/languages.yaml index 41fa7df..1baeea8 100644 --- a/languages.yaml +++ b/languages.yaml @@ -1,24 +1,24 @@ en: Terms_Of_Service: "Terms Of Service" Privacy_Policy: "Privacy Policy" - Changelog: "Changelog" + Changelog: "Change­log" fr: Terms_Of_Service: "Conditions d'utilisation" Privacy_Policy: "Politique de confidentialité" - Changelog: "Changelog" + Changelog: "Change­log" es: Terms_Of_Service: "Al utilizar cualquiera" Privacy_Policy: "Política de Privacidad" - Changelog: "Changelog" + Changelog: "Change­log" de: - Terms_Of_Service: "Nutzungsbedingungen" - Privacy_Policy: "Datenschutzerklärung" - Changelog: "Changelog" + Terms_Of_Service: "Nutzungs­bedingungen" + Privacy_Policy: "Datenschutz­erklärung" + Changelog: "Change­log" it: Terms_Of_Service: "Utilizzando i servizi" Privacy_Policy: "Informativa sulla privacy" - Changelog: "Changelog" + Changelog: "Change­log" diff --git a/templates/partials/footer.html.twig b/templates/partials/footer.html.twig index 1c987ed..d21ab30 100644 --- a/templates/partials/footer.html.twig +++ b/templates/partials/footer.html.twig @@ -6,22 +6,26 @@ From 73c9712956ef6c03408be2a5d602ff119db3ba10 Mon Sep 17 00:00:00 2001 From: floss4good Date: Tue, 6 Feb 2024 02:29:57 +0200 Subject: [PATCH 2/3] Comment out CSS related to #footer-logo --- css/media-queries.css | 2 +- css/style.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/css/media-queries.css b/css/media-queries.css index 4d241c6..e694a2f 100644 --- a/css/media-queries.css +++ b/css/media-queries.css @@ -21,7 +21,7 @@ /* Icons */ footer #footer-icons { display: none; } - footer #footer-logo { display: none; } + /*footer #footer-logo { display: none; }*/ footer #footer-left { display: none; } /* Go To Top Button */ diff --git a/css/style.css b/css/style.css index 68827ab..c60b4b6 100644 --- a/css/style.css +++ b/css/style.css @@ -1731,6 +1731,8 @@ footer { align-items: center; } +/* there is no logo anymore in the footer + * TODO: d-white.png should probably be removed since is not used elsewhere footer #footer-logo { background: url("../images/d-white.png") no-repeat center; background-size: contain; @@ -1738,6 +1740,7 @@ footer { margin-left: 1dvw; opacity: 0.7; } +*/ footer #footer-left { display: flex; @@ -1755,12 +1758,14 @@ footer #footer-left { opacity: 0.7; } +/* there is no logo anymore in the footer #footer-logo a { display: flex; width: 45px; height: 45px; margin-bottom: 0; } +*/ #footer-copyleft a { display: flex; From ad1723a4099c118827a734c01dcba479dc476e1d Mon Sep 17 00:00:00 2001 From: floss4good Date: Wed, 7 Feb 2024 17:09:32 +0200 Subject: [PATCH 3/3] fix: Added CC BY-SA icon (Disroot beetroot flavor) for blog theme --- css/style.css | 2 +- images/by-sa.png | Bin 0 -> 5415 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 images/by-sa.png diff --git a/css/style.css b/css/style.css index c60b4b6..7f866b4 100644 --- a/css/style.css +++ b/css/style.css @@ -1751,7 +1751,7 @@ footer #footer-left { } #footer-copyleft { - background: url("https://disroot.org/user/themes/disroot/images/by-sa.png") no-repeat center; + background: url("../images/by-sa.png") no-repeat center; background-size: contain; margin-bottom: 0; margin-left: 1dvw; diff --git a/images/by-sa.png b/images/by-sa.png new file mode 100644 index 0000000000000000000000000000000000000000..36743ae5991a8d4d234c6f6eb46c24a9a2aa230b GIT binary patch literal 5415 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 R1F`@B002ovPDHLkV1kF)n2P`a literal 0 HcmV?d00001