From 553fb71c59ad9f583b62d2ec153507d646c329a1 Mon Sep 17 00:00:00 2001 From: meaz Date: Tue, 28 Dec 2021 11:09:35 +0100 Subject: [PATCH 1/4] fix missing closing } in media queries --- css/media-queries.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/css/media-queries.css b/css/media-queries.css index 19738e4..513413b 100644 --- a/css/media-queries.css +++ b/css/media-queries.css @@ -355,8 +355,6 @@ div#nav-logo { } -} - /* Goals ------------------------------------*/ -- 2.39.5 From 24d8a22f0ec16138497d685ebfc38d202b5f055c Mon Sep 17 00:00:00 2001 From: meaz Date: Tue, 28 Dec 2021 11:10:33 +0100 Subject: [PATCH 2/4] add css for translation banner + fix some error in css file --- css/style.css | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/css/style.css b/css/style.css index 0cc9a39..2fdf651 100644 --- a/css/style.css +++ b/css/style.css @@ -196,7 +196,17 @@ figcaption { line-height: 1; } +/***** Banner for translation ********************/ +.translation_banner { + color: black; + background-color: #CACAC8; + padding-top: 1em; + padding-bottom: 4em; + padding-left: 2em; + padding-right: 2em; + text-align: center; + } /************************************************/ @@ -215,7 +225,6 @@ figcaption { background-position: right bottom; background-size: cover !important; -webkit-background-size: cover !important; - -moz-background-size: cover; -o-background-size: cover; -webkit-filter: grayscale(100%); /* Safari 6.0 - 9.0 */ filter: grayscale(100%); @@ -902,18 +911,6 @@ img.transparent { /* Goals ------------------------------------*/ - -#.goal { -# color: #555; -# background-color: #FFF; -# /*border: 5px double #8EB726;*/ -# border: none; -# border-radius: 10px; -# padding-bottom: 5px; -# box-shadow: 10px 10px 38px 0px rgba(0, 0, 0, 0.25); -# margin-bottom: 20%; -#} - .goals { position: relative; display: flex; @@ -1127,7 +1124,7 @@ textarea { } #accordion hr { - border-top: 1 solid #E3E3E3; + border-top: 1px solid #E3E3E3; } .vertical ol { @@ -1423,7 +1420,6 @@ footer a:hover, footer a:focus { color: #1F5C60; } cursor: pointer; text-indent: -9999px; -webkit-border-radius: 20px; - -moz-border-radius: 20px; -o-border-radius: 20px; border-radius: 20px; box-shadow: inset 0 0 3px rgba(255, 255, 255, .3); -- 2.39.5 From c42c1940b573831a627c90dd1155fa72445a930b Mon Sep 17 00:00:00 2001 From: meaz Date: Tue, 28 Dec 2021 11:10:48 +0100 Subject: [PATCH 3/4] create template for translation banner --- templates/modular.html.twig | 4 +++ templates/partials/banner.html.twig | 48 +++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 templates/partials/banner.html.twig diff --git a/templates/modular.html.twig b/templates/modular.html.twig index 308f0a5..dbfcf72 100644 --- a/templates/modular.html.twig +++ b/templates/modular.html.twig @@ -4,10 +4,14 @@ {% macro pageLinkName(text) %}{{ text|lower|replace({' ':'_'}) }}{% endmacro %} {% block content %} + {{ page.content|raw }}
+ {% include 'partials/banner.html.twig' %} + {% for module in page.collection() %} {{ module.content|raw }} {% endfor %}
+ {% endblock %} diff --git a/templates/partials/banner.html.twig b/templates/partials/banner.html.twig new file mode 100644 index 0000000..010f5f1 --- /dev/null +++ b/templates/partials/banner.html.twig @@ -0,0 +1,48 @@ +{% if page.header.translation_banner.set == "true" %} +
+ +{% if page.header.translation_banner.language == "French" %} +

FRENCH This page was last updated on {{ page.header.translation_banner.last_modified }}
+ Disroot's website translation is a community driven procces. We try to keep it as updated as we can.
+ If you want to help, check our website's git repository

+

+ +{% elseif page.header.translation_banner.language == "Spanish" %} +

SPANISH This page was last updated on {{ page.header.translation_banner.last_modified }}
+ Disroot's website translation is a community driven procces. We try to keep it as updated as we can.
+ If you want to help, check our website's git repository

+

+ +{% elseif page.header.translation_banner.language == "Italian" %} +

ITALIAN This page was last updated on {{ page.header.translation_banner.last_modified }}
+ Disroot's website translation is a community driven procces. We try to keep it as updated as we can.
+ If you want to help, check our website's git repository

+

+ +{% elseif page.header.translation_banner.language == "German" %} +

GERMAN This page was last updated on {{ page.header.translation_banner.last_modified }}
+ Disroot's website translation is a community driven procces. We try to keep it as updated as we can.
+ If you want to help, check our website's git repository

+

+ +{% elseif page.header.translation_banner.language == "Russian" %} +

RUSSIAN This page was last updated on {{ page.header.translation_banner.last_modified }}
+ Disroot's website translation is a community driven procces. We try to keep it as updated as we can.
+ If you want to help, check our website's git repository

+

+ +{% elseif page.header.translation_banner.language == "Portuguese" %} +

PORTUGUESE This page was last updated on {{ page.header.translation_banner.last_modified }}
+ Disroot's website translation is a community driven procces. We try to keep it as updated as we can.
+ If you want to help, check our website's git repository

+

+ +{% else %} +

This page was last updated on {{ page.header.translation_banner.last_modified }}
+ Disroot's website translation is a community driven procces. We try to keep it as updated as we can.
+ If you want to help, check our website's git repository

+

+{% endif %} + +
+{% endif %} -- 2.39.5 From f9de9085677fdeee5bee6f276265a50698b68aff Mon Sep 17 00:00:00 2001 From: meaz Date: Tue, 28 Dec 2021 11:11:03 +0100 Subject: [PATCH 4/4] fix error in page padding --- templates/modular/fullbar.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/modular/fullbar.html.twig b/templates/modular/fullbar.html.twig index d995c8b..e8cab8d 100644 --- a/templates/modular/fullbar.html.twig +++ b/templates/modular/fullbar.html.twig @@ -6,7 +6,7 @@
{% endif %} -
+
{{ page.content|raw }}
-- 2.39.5