diff --git a/content/_index.md b/content/_index.md index 077d5c56..3a5973fa 100644 --- a/content/_index.md +++ b/content/_index.md @@ -26,7 +26,7 @@ extra: services_section_card_description_2: The app is designed with privacy as a priority and does not identify users, or track information about them. services_section_card_description_3: Save Your Battery Efficiently uses your battery, doesn’t drain your battery like other navigation apps Learn more services_section_card_description_4: People like you helped build the app by adding locations to the OpenStreetMap, giving feedback on features, and contributing code - services_section_card_button_info_1: Search + services_section_card_button_info_1: No internet needed services_section_card_button_info_2: No additional permissions required services_section_card_button_info_3: less power usage services_section_card_button_info_4: Free for everyone, Made with love diff --git a/content/news/_index.af.md b/content/news/_index.af.md index a7b81598..a08b73bb 100644 --- a/content/news/_index.af.md +++ b/content/news/_index.af.md @@ -2,8 +2,8 @@ description: "Bl op hoogte van nuwe Organic Maps-weergawes, nuus en bywerkings van ons span" extra: menu_title: Nuus -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: Jongste nuus en bywerkings van ons span" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: Jongste nuus en bywerkings van ons span" --- diff --git a/content/news/_index.ar.md b/content/news/_index.ar.md index ff449b6a..75ef7130 100644 --- a/content/news/_index.ar.md +++ b/content/news/_index.ar.md @@ -2,8 +2,8 @@ description: "ابقَ على تواصل بأحدث الإصدارات Organic Maps والأخبار والتحديثات من فريقنا" extra: menu_title: الأخبار -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: آخر الأخبار والتحديثات من فريقنا" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: آخر الأخبار والتحديثات من فريقنا" --- diff --git a/content/news/_index.ca.md b/content/news/_index.ca.md index 8a21af56..75cff629 100644 --- a/content/news/_index.ca.md +++ b/content/news/_index.ca.md @@ -2,8 +2,8 @@ description: "Seguiu les novetats de l'Organic Maps, notícies i actualitzacions del nostre equip" extra: menu_title: Notícies -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: les notícies i novetats més recents del nostre equip" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: les notícies i novetats més recents del nostre equip" --- diff --git a/content/news/_index.cs.md b/content/news/_index.cs.md index 133966b6..89964e4d 100644 --- a/content/news/_index.cs.md +++ b/content/news/_index.cs.md @@ -2,8 +2,8 @@ description: "Zůstaňte v kontaktu s nejnovějšími verzemi Organic Maps, novinkami a aktualizacemi od našeho týmu" extra: menu_title: Novinky -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: Nejnovější zprávy a aktualizace od našeho týmu" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: Nejnovější zprávy a aktualizace od našeho týmu" --- diff --git a/content/news/_index.de.md b/content/news/_index.de.md index 6f8a32d1..3281d489 100644 --- a/content/news/_index.de.md +++ b/content/news/_index.de.md @@ -2,8 +2,8 @@ description: "Bleibe auf dem Laufenden mit den neuesten Veröffentlichungen von Organic Maps, Neuigkeiten und Updates von unserem Team" extra: menu_title: Neuigkeiten -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: Neueste Nachrichten und Updates von unserem Team" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: Neueste Nachrichten und Updates von unserem Team" --- diff --git a/content/news/_index.es.md b/content/news/_index.es.md index a3f7d2b7..1e9ce9f7 100644 --- a/content/news/_index.es.md +++ b/content/news/_index.es.md @@ -2,8 +2,8 @@ description: "Permanezca al tanto de los últimos lanzamientos de Organic Maps, las noticias y las actualizaciones de nuestro equipo" extra: menu_title: Noticias -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: noticias y actualizaciones más recientes de nuestro equipo" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: noticias y actualizaciones más recientes de nuestro equipo" --- diff --git a/content/news/_index.eu.md b/content/news/_index.eu.md index c7d1ada8..7c6c8f1a 100644 --- a/content/news/_index.eu.md +++ b/content/news/_index.eu.md @@ -2,8 +2,8 @@ description: "Mantendu informatuta gure taldearen azken bertsio-publikazio, albiste eta eguneraketekin" extra: menu_title: Berriak -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: azken albiste eta eguneraketak gure lan-taldetik" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: azken albiste eta eguneraketak gure lan-taldetik" --- diff --git a/content/news/_index.hi.md b/content/news/_index.hi.md index 349a2e80..207ee0e0 100644 --- a/content/news/_index.hi.md +++ b/content/news/_index.hi.md @@ -2,8 +2,8 @@ description: "हमारी टीम के आधुनिकतम ऑर्गेनिक मानचित्र रिलीज़, समाचार, एवम अपडेट के संपर्क में रहें" extra: menu_title: समाचार -page_template: news_post.html -sort_by: date -template: news.html -title: "ऑर्गेनिक मैप्स: हमारी टीम से नवीनतम समाचार और अपडेट" + page_template: news_post.html + sort_by: date + template: news.html + title: "ऑर्गेनिक मैप्स: हमारी टीम से नवीनतम समाचार और अपडेट" --- diff --git a/content/news/_index.hu.md b/content/news/_index.hu.md index a0124045..979f7a28 100644 --- a/content/news/_index.hu.md +++ b/content/news/_index.hu.md @@ -2,8 +2,8 @@ description: "Maradjon kapcsolatban a legfrissebb Organic Maps kiadványokkal, hírekkel és frissítésekkel csapatunktól" extra: menu_title: Hírek -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: Legfrissebb hírek és újdonságok a csapatunktól" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: Legfrissebb hírek és újdonságok a csapatunktól" --- diff --git a/content/news/_index.id.md b/content/news/_index.id.md index 3ae7d8b0..9716e427 100644 --- a/content/news/_index.id.md +++ b/content/news/_index.id.md @@ -2,8 +2,9 @@ description: "Tetap terhubung dengan rilis Organic Maps terbaru, berita dan pembaruan dari tim kami" extra: menu_title: Berita -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: Berita dan pembaruan terbaru dari tim kami" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: Berita dan pembaruan terbaru dari tim kami" --- + \ No newline at end of file diff --git a/content/news/_index.md b/content/news/_index.md index 726dcee7..ba559da2 100644 --- a/content/news/_index.md +++ b/content/news/_index.md @@ -6,4 +6,6 @@ page_template: news_post.html sort_by: date extra: menu_title: News + menu_title_pre: Home + hero_image: /news/kv-news.png --- diff --git a/content/news/_index.pl.md b/content/news/_index.pl.md index 5ea8851d..0efe2c6a 100644 --- a/content/news/_index.pl.md +++ b/content/news/_index.pl.md @@ -2,8 +2,8 @@ description: "Bądź na bieżąco z najnowszymi wydaniami Organic Maps, wiadomościami i aktualizacjami od naszego zespołu" extra: menu_title: Nowości -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: Najnowsze wiadomości i aktualizacje od naszego zespołu" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: Najnowsze wiadomości i aktualizacje od naszego zespołu" --- diff --git a/content/news/_index.pt-BR.md b/content/news/_index.pt-BR.md index 3be081bc..55892b34 100644 --- a/content/news/_index.pt-BR.md +++ b/content/news/_index.pt-BR.md @@ -2,8 +2,8 @@ description: "Fique atualizado com os últimos lançamentos, notícias e atualizações do Organic Maps" extra: menu_title: Notícias -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: Últimas notícias e atualizações de nossa equipe" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: Últimas notícias e atualizações de nossa equipe" --- diff --git a/content/news/_index.sv.md b/content/news/_index.sv.md index a6f24188..3ffc2ea4 100644 --- a/content/news/_index.sv.md +++ b/content/news/_index.sv.md @@ -2,8 +2,8 @@ description: "Håll dig uppdaterad med de senaste versionerna av Organic Maps, nyheter samt uppdateringar från vårt team" extra: menu_title: Nyheter -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps: De senaste nyheterna och uppdateringarna från vårt team" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps: De senaste nyheterna och uppdateringarna från vårt team" --- diff --git a/content/news/_index.zh-Hans.md b/content/news/_index.zh-Hans.md index b1170846..b687348d 100644 --- a/content/news/_index.zh-Hans.md +++ b/content/news/_index.zh-Hans.md @@ -2,8 +2,8 @@ description: "关注Organic Maps新版发布、新闻和更新" extra: menu_title: 新闻 -page_template: news_post.html -sort_by: date -template: news.html -title: "Organic Maps:近期新闻和更新" + page_template: news_post.html + sort_by: date + template: news.html + title: "Organic Maps:近期新闻和更新" --- diff --git a/content/news/kv-news.png b/content/news/kv-news.png new file mode 100644 index 00000000..3c2affd1 Binary files /dev/null and b/content/news/kv-news.png differ diff --git a/sass/common/footer.scss b/sass/common/footer.scss index f069599c..29af9915 100644 --- a/sass/common/footer.scss +++ b/sass/common/footer.scss @@ -39,11 +39,12 @@ &__link { text-decoration: none; color: var(--black-white); - padding: 8rem 16rem; + padding: 8rem 6rem; } &__rw { - display: grid; - grid-template-columns: 160rem repeat(2, 1fr); + display: flex; + justify-content: space-between; + align-items: center; gap: 38rem; svg { width: 100%; diff --git a/sass/component/header-sub.scss b/sass/component/header-sub.scss index 3feb1523..a24405ce 100644 --- a/sass/component/header-sub.scss +++ b/sass/component/header-sub.scss @@ -2,7 +2,7 @@ .hero-sub { background-size: cover; - padding: var(--menu-height) 0 124rem; + padding: 20rem 0 124rem; position: relative; background-position: center center; diff --git a/sass/global/index.scss b/sass/global/index.scss index 16ebbc1d..56419418 100644 --- a/sass/global/index.scss +++ b/sass/global/index.scss @@ -30,7 +30,12 @@ max-width: 130rem; .frizz { overflow: hidden; } - +.main { + padding-top: 80rem; + @media(max-width: $media-md) { +padding-top: 65rem; + } +} .line { width: 100%; background-color: var(--green-button); diff --git a/sass/main.scss b/sass/main.scss index 6faf1104..3ccbef79 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -34,5 +34,6 @@ @import "./pages/about-us"; @import "./pages/crowdfunding"; @import "./pages/download"; +@import "./pages/news"; diff --git a/sass/pages/home.scss b/sass/pages/home.scss index 7597233f..f03ebe5d 100644 --- a/sass/pages/home.scss +++ b/sass/pages/home.scss @@ -2,6 +2,7 @@ // Hero Section .hero { + margin: -80rem 0 0; background: var(--common-black) url('/images/hero/hero-bg.jpg') center center / cover no-repeat fixed; height: 100vh; max-height: 900rem; @@ -15,6 +16,7 @@ background: url('/images/hero/hero-bg.jpg') center center / cover no-repeat cover; min-height: auto; padding: 120rem 0 51rem; + margin: 0; } &__container { @@ -53,6 +55,7 @@ margin-bottom: 35rem; top: 50%; right: -20rem; transform: translateY(-50%); + max-width: 572rem; @media (max-width: $media-md) { position: static; transform: none; @@ -96,6 +99,10 @@ margin-bottom: 35rem; } &__title { margin-bottom: var(--mb-16); + color: var(--map-grey-text); + } + &__description { + color: var(--map-grey-text); } &__icon { position: absolute; diff --git a/sass/pages/news.scss b/sass/pages/news.scss new file mode 100644 index 00000000..bbb24bc1 --- /dev/null +++ b/sass/pages/news.scss @@ -0,0 +1,19 @@ +@import "../variables/media"; + +.main-news { + &__row { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + + } + .news { + width: 48%; + margin-bottom: 20rem; + img { + width: 100%; + } + } +} + diff --git a/sass/variables/color-theme.scss b/sass/variables/color-theme.scss index 017a07ba..ca511b77 100644 --- a/sass/variables/color-theme.scss +++ b/sass/variables/color-theme.scss @@ -16,6 +16,7 @@ --common-grey-v4: #E5F0EB; --common-grey-v5: #CECECE; --common-grey-v6: #BBD7A7; + --common-grey-v7: #636363; --common-green-border: #99C4AF; --common-line-color: #AEC5BA; --common-black-sub: #26312C; @@ -29,6 +30,7 @@ // Theme COLOR change .light { + --map-grey-text: var(--common-grey-v7); --point-color: var(--common-green); --link-map-section: var(--common-white); --cart-bg: var(--common-acord-button); @@ -51,6 +53,7 @@ } .dark { + --map-grey-text: var(--common-white); --point-color: var(--common-green-primery); --link-map-section: var(--common-grey-v6); --cart-bg: var(--common-green-02); diff --git a/static/images/hero/hero-image.png b/static/images/hero/hero-image.png index 798c19b2..b3c0d4e3 100644 Binary files a/static/images/hero/hero-image.png and b/static/images/hero/hero-image.png differ diff --git a/static/images/open-map/unsplash-1.png b/static/images/open-map/unsplash-1.png index 20fcb75d..c7275aa3 100644 Binary files a/static/images/open-map/unsplash-1.png and b/static/images/open-map/unsplash-1.png differ diff --git a/static/images/open-map/unsplash-2.png b/static/images/open-map/unsplash-2.png index 18db053d..00a5f97a 100644 Binary files a/static/images/open-map/unsplash-2.png and b/static/images/open-map/unsplash-2.png differ diff --git a/static/images/open-map/unsplash-3.png b/static/images/open-map/unsplash-3.png index ca4917b8..160034d1 100644 Binary files a/static/images/open-map/unsplash-3.png and b/static/images/open-map/unsplash-3.png differ diff --git a/static/images/sections/map-s-2.png b/static/images/sections/map-s-2.png index 8c04a42f..5e91531d 100644 Binary files a/static/images/sections/map-s-2.png and b/static/images/sections/map-s-2.png differ diff --git a/static/images/sections/singl-card-1.png b/static/images/sections/singl-card-1.png index fefe33af..5f940be3 100644 Binary files a/static/images/sections/singl-card-1.png and b/static/images/sections/singl-card-1.png differ diff --git a/templates/common/footer.html b/templates/common/footer.html index 1858b34f..0b4d1e02 100644 --- a/templates/common/footer.html +++ b/templates/common/footer.html @@ -10,13 +10,10 @@ -{{ section.extra.menu_title }} + {{ resource.content | safe }} diff --git a/templates/news.html b/templates/news.html index 78445e11..a36b88ba 100644 --- a/templates/news.html +++ b/templates/news.html @@ -1,57 +1,95 @@ {% extends 'base.html' %} {% block meta %} -{# TODO: For translated pages the following code generates: Function call 'get_section' failed, Section `` not found #} -{# set latestStr = resource.subsections | sort | last #} -{# set latestSection = get_section(path=latestStr) #} -{# set latestPage = latestSection.pages | first #} -{% set latestPage = section.pages | first %} - + {# TODO: For translated pages the following code generates: Function call 'get_section' failed, Section `` not found #} + {# set latestStr = resource.subsections | sort | last #} + {# set latestSection = get_section(path=latestStr) #} + {# set latestPage = latestSection.pages | first #} + {% set latestPage = section.pages | first %} + {% endblock meta %} {% block content %} -

{{ resource.title }}

-{# Iterate and use en sections by default and use localized versions only if they are present #} -{% set enNewsSectionTranslation = section.translations | filter(attribute='lang', value='en') | first %} -{% set enNewsSection = get_section(path=enNewsSectionTranslation.path) %} -{% for sectionStr in enNewsSection.subsections | sort | reverse %} -{% set section = get_section(path=sectionStr) %} -{% for page in section.pages %} -{% set translatedPage = page.translations | filter(attribute='lang', value=lang) | first %} -{% if translatedPage %} - {% set page = get_page(path=translatedPage.path) %} -{% endif %} +
+
+ +
+

+ News and Releases +

- - -{# Display wide images below the text instead of to the right. #} -{% set_global noflex = '' %} -{% for photo in page.assets %} - {% set meta = get_image_metadata(path=photo) %} - {% if meta.width > meta.height %} - {% set_global noflex = '_noflex' %} - {% break %} - {% endif %} -{% endfor %} -
-{% if page.content %} -
{{ page.content | safe }}
-{% endif %} +
+
+
- -{% for photo in page.assets | sort %} -{% set meta = get_image_metadata(path=photo) %} - -{% endfor %} - +
+
- + {# Iterate and use en sections by default and use localized versions only if they are present #} + {% set enNewsSectionTranslation = section.translations | filter(attribute='lang', value='en') | first %} + {% set enNewsSection = get_section(path=enNewsSectionTranslation.path) %} -
-{% endfor %} -{% endfor %} + {% for sectionStr in enNewsSection.subsections | sort | reverse %} + {% set section = get_section(path=sectionStr) %} + {% for page in section.pages %} + {% set translatedPage = page.translations | filter(attribute='lang', value=lang) | first %} + {% if translatedPage %} + {% set page = get_page(path=translatedPage.path) %} + {% endif %} +
+
+ + {# Display wide images below the text instead of to the right. #} + {% set_global noflex = '' %} + {% for photo in page.assets %} + {% set meta = get_image_metadata(path=photo) %} + {% if meta.width > meta.height %} + {% set_global noflex = '_noflex' %} + {% break %} + {% endif %} + {% endfor %} +
+ {% if page.content %} +
{{ page.content | safe }}
+ {% endif %} + + + {% for photo in page.assets | sort %} + {% set meta = get_image_metadata(path=photo) %} + img + {% endfor %} + +
+
+
+ + + {% endfor %} + {% endfor %} + + {% include 'section/donate.html' %} +
{% endblock content %} diff --git a/templates/section/open_map.html b/templates/section/open_map.html index 1366d6ed..1419a7ad 100644 --- a/templates/section/open_map.html +++ b/templates/section/open_map.html @@ -2,20 +2,20 @@

- + Organic

- + Community + Open Maps

- - - - - - - - + img + img + img + img + img + img + img + img
diff --git a/templates/ui/icons/social/card/icon01.html b/templates/ui/icons/social/card/icon01.html index 6eb4f996..75f1cc36 100644 --- a/templates/ui/icons/social/card/icon01.html +++ b/templates/ui/icons/social/card/icon01.html @@ -1,3 +1,7 @@ - - - \ No newline at end of file + + + + + + +