[WIP] Major website redesign #236

Draft
borntojesus wants to merge 108 commits from preprod into master
33 changed files with 548 additions and 212 deletions
Showing only changes of commit 617e663814 - Show all commits

View file

@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
</profile>
</component>

6
.idea/vcs.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

105
.idea/workspace.xml generated Normal file
View file

@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="b9871119-7d48-43df-9f66-6fd91d65a1cb" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/sass/_download-button.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sass/_freedom-section.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sass/_hero.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sass/_open-map.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sass/_site-sections.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sass/_top-menu.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/images/arrow-link.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/images/arrow-link.svg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/images/hero/hero-bg.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/images/hero/hero-image.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/images/open-map/open-map-bg.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/images/open-map/open-map-logo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/images/sections/free-and-builty-by-community-banner.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/images/sections/no-tracking-banner.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/images/sections/save-your-battery-banner.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/static/images/sections/search-and-plan-route-banner.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/templates/freedom_section.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/templates/hero.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/templates/index-old.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/templates/open_map.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/templates/site_sections.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/templates/ui/download-button.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/templates/ui/logo.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/content/_index.md" beforeDir="false" afterPath="$PROJECT_DIR$/content/_index.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sass/_top_menu.scss" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/sass/main.scss" beforeDir="false" afterPath="$PROJECT_DIR$/sass/main.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/base.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/base.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/bottom_menu.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/bottom_menu.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/top_menu.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/top_menu.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectColorInfo">{
&quot;associatedIndex&quot;: 8
}</component>
<component name="ProjectId" id="2XtPqp4nfatb5z8aknynlDefs2J" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "E:/organicmaps.github.io/static/images",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.stylelint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.stylelint": "E:\\organicmaps.github.io\\node_modules\\stylelint",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\organicmaps.github.io\static\images" />
<recent name="E:\organicmaps.github.io\templates" />
<recent name="E:\organicmaps.github.io\sass" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\organicmaps.github.io\static\images\sections" />
<recent name="E:\organicmaps.github.io\static\images\open-map" />
<recent name="E:\organicmaps.github.io\static\images\hero" />
<recent name="E:\organicmaps.github.io\static\images" />
<recent name="E:\organicmaps.github.io\templates" />
</key>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="b9871119-7d48-43df-9f66-6fd91d65a1cb" name="Changes" comment="" />
<created>1699445595123</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1699445595123</updated>
<workItem from="1699445596944" duration="246000" />
<workItem from="1699445857666" duration="387000" />
<workItem from="1699446263788" duration="8939000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
</project>

View file

@ -7,107 +7,4 @@ extra:
menu_title: Home
---
**Organic Maps** is a free Android & iOS offline maps app for travelers, tourists, hikers, and cyclists based on top of crowd-sourced **[OpenStreetMap][openstreetmap]** data. It is a privacy-focused, open-source [fork][fork] of **Maps.me** app (previously known as [**MapsWithMe**][mapswithme]), maintained by the same people who created **MapsWithMe** in 2011.
**Organic Maps** is one of the only applications nowadays that supports 100% of features without an active Internet connection. Install Organic Maps, download maps, throw away your SIM card (by the way, your operator constantly tracks you), and go for a weeklong trip on a single battery charge without any byte sent to the network.
### Download and install Organic Maps from [AppStore][appstore], [Google Play][googleplay], [FDroid][fdroid], [Huawei AppGallery][appgallery] {#install}
{{ badges() }}
{{ screenshot(src='/images/screenshots/hiking.jpg', alt='Hiking') }}
{{ screenshot(src='/images/screenshots/prague.jpg', alt='Prague') }}
{{ screenshot(src='/images/screenshots/search.jpg', alt='Offline Search') }}
{{ screenshot(src='/images/screenshots/dark.jpg', alt='Navigation in dark mode') }}
## Features
Organic Maps is the ultimate companion app for travelers, tourists, hikers, and cyclists:
- Detailed offline maps with places that don't exist on other maps, thanks to [OpenStreetMap][openstreetmap]
- Cycling routes, hiking trails, and walking paths
- Contour lines, elevation profiles, peaks, and slopes
- Turn-by-turn walking, cycling, and car navigation with voice guidance
- Fast offline search on the map
- Bookmarks and tracks in KML, KMZ, GPX formats
- Dark Mode to protect your eyes
- Countries and regions don't take a lot of space
- Free and open-source
## Why Organic?
Organic Maps is pure and organic, made with love:
- Respects your privacy
- Saves your battery
- No unexpected mobile data charges
Organic Maps app is free from trackers and other bad stuff:
- No ads
- No tracking
- No data collection
- No phoning home
- No annoying registration
- No mandatory tutorials
- No noisy email spam
- No push notifications
- No crapware
- ~~No pesticides~~ Purely organic!
The application is verified by [Exodus Privacy Project][exodus]:
{{ exodus_screenshot() }}
The iOS application is verified by [TrackerControl for iOS][trackercontrol]:
{{ trackercontrol_screenshot() }}
Organic Maps doesn't request excessive permissions to spy on you:
{{ privacy_screenshots() }}
At Organic Maps, we believe that privacy is a fundamental human right:
- Organic Maps is an indie community-driven open-source project
- We protect your privacy from Big Tech's prying eyes
- Stay safe no matter wherever you are
Reject surveillance - embrace your freedom.
**[Give Organic Maps a try!](#install)**
## Who is paying for the free app?
The app is free for everyone. Please [donate](@/donate/index.md) to support us!
To donate conveniently, click on your preferred payment method icon below:
{{ donate_buttons() }}
### Our sponsors:
[Mythic Beasts](https://www.mythic-beasts.com/) ISP [provides us][mythic_beasts_donation] two virtual servers with 400 TB/month of free bandwidth to help our users with maps downloads and updates.
## Community
Organic Maps is an [open-source software][github] licensed under the Apache License 2.0.
- Please join our beta program, suggest your features, and report bugs:
* [iOS Beta (TestFlight)][testflight]
* [Android Beta (Firebase)][firebase]
* [Linux Desktop Beta (Flatpak)][flatpak]
* [Linux Desktop Beta (packages)][repology]
- Report bugs or issues to [the issue tracker][issues] or [email us][email].
- [Discuss][ideas] ideas or propose feature requests.
- Subscribe to our [Telegram Channel][telegram] or to the [matrix space][matrix] for updates.
- Join our [Telegram Group][telegram_chat] to discuss with other users.
- Visit our [GitHub page][github].
- Follow our updates in [Mastodon][mastodon], [Facebook][facebook], [Twitter][twitter], [Instagram][instagram], [Reddit][reddit], [LinkedIn][LinkedIn].
[fork]: https://en.wikipedia.org/wiki/Fork_(software_development)
{{ references() }}

View file

@ -0,0 +1,11 @@
.download-button {
width: 133px;
max-width: 100%;
padding: 12px 16px;
border-radius: 8px;
background: #006C35;
color: white;
display: inline-block;
text-align: center;
text-decoration: none;
}

View file

@ -0,0 +1,33 @@
.freedom__section .container {
background: var(--colors-brand-green-primary-1, #E5F0EB);
margin-bottom: 5px;
border-radius: 24px;
padding: 30px 40px;
.freedom__section {
&__info {
display: flex;
align-items: center;
&__title {
font-size: 48px;
font-weight: 300;
margin-bottom: 23px;
}
&__description {
font-size: 18px;
font-weight: 300;
margin-bottom: 23px;
}
&__link {
font-size: 18px;
font-weight: 300;
color: #006031;
background: url('/images/arrow-link.svg') no-repeat right center;
padding-right: 30px;
}
}
}
}

34
sass/_hero.scss Normal file
View file

@ -0,0 +1,34 @@
.hero {
background-image: url('/images/hero/hero-bg.jpg');
background-repeat: no-repeat;
background-position: center;
background-size: 100%;
min-height: 820px;
width: 100vw;
max-width: 100%;
display: flex;
align-items: center;
&__wrapper {
display: flex;
align-items: center;
gap: 100px;
}
&__about-us-title {
font-family: Lato, sans-serif;
font-size: 40px;
font-style: normal;
color:white;
font-weight: 300;
}
&__about-us-description {
font-family: Inter, sans-serif;
margin-top: 16px;
margin-bottom: 40px;
font-size: 24px;
color: white
}
&__image {
width: 480px;
max-width: 100%;
}
}

30
sass/_open-map.scss Normal file
View file

@ -0,0 +1,30 @@
.open__map {
background-image: url('/images/open-map/open-map-bg.jpg');
background-repeat: no-repeat;
background-position: center;
background-size: 65%;
min-height: 820px;
width: 100vw;
max-width: 100%;
display: flex;
align-items: center;
margin-top: 54px;
&__info {
text-align: center;
font-family: Lato;
&__title {
font-family: Lato;
font-size: 48px;
line-height: 60px;
margin-bottom: 20px;
font-weight: 300;
}
&__description {
font-size: 24px;
line-height: 30px;
font-weight: 300;
}
}
}

44
sass/_site-sections.scss Normal file
View file

@ -0,0 +1,44 @@
.sections .container {
background: var(--colors-brand-green-primary-1, #E5F0EB);
padding: 60px 40px;
margin-bottom: 5px;
}
.container--main {
border-bottom-left-radius: 24px;
border-bottom-right-radius: 24px;
}
.shadow {
box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
margin-bottom: 5px;
border-top-left-radius: 24px;
border-top-right-radius: 24px;
}
.sections {
&__separate {
display: flex;
align-items: center;
margin-bottom: 120px;
gap: 40px;
&__info {
font-family: Lato;
&__title {
font-size: 48px;
font-weight: 300;
margin-bottom: 23px;
}
&__description {
font-size: 18px;
font-weight: 300;
margin-bottom: 23px;
}
&__link {
font-size: 18px;
font-weight: 300;
color: #006031;
background: url('/images/arrow-link.svg') no-repeat right center;
padding-right: 30px;
}
}
}
}

54
sass/_top-menu.scss Normal file
View file

@ -0,0 +1,54 @@
.top-menu__item,
.top-menu__item_active {
white-space: nowrap;
a {
text-decoration: none;
}
}
.top-menu__donate a {
color: red;
}
.github svg {
fill: black;
@media (prefers-color-scheme: dark) {
fill: white;
}
display: inline-block;
overflow: visible !important;
margin-right: 0.5rem;
}
header {
position: absolute;
top: 0;
left: 50%;
transform: translateX(-50%);
}
.top-menu {
&__wrapper {
display: flex;
justify-content: space-between;
align-items: center;
padding: 12px 0;
}
&__links {
display: flex;
align-items: center;
gap: 8px;
}
&__cta {
display: flex;
align-items: center;
gap: 68px;
}
&__item {
padding: 8px 16px;
a {color: white}
}
}

View file

@ -1,36 +0,0 @@
.top_menu_logo {
background-image: url("/logos/green-on-transparent.svg");
background-size: contain;
background-repeat: no-repeat;
background-position: left center;
background-origin: content-box;
width: 32px;
height: 32px;
display: inline-block;
vertical-align: middle;
}
.top_menu_item,
.top_menu_item_active {
white-space: nowrap;
a {
text-decoration: none;
}
}
.top_menu_donate a {
color: red;
}
.github svg {
fill: black;
@media (prefers-color-scheme: dark) {
fill: white;
}
display: inline-block;
overflow: visible !important;
margin-right: 0.5rem;
}

View file

@ -1,19 +1,24 @@
@import "./language_selector";
@import "./top_menu";
@import "./top-menu";
@import "./download-button";
@import "./hero";
@import "./open-map.scss";
@import "./_site-sections.scss";
@import "./_freedom-section.scss";
body {
margin: 1rem;
margin: 0;
padding: 0;
font-family:
-apple-system,
BlinkMacSystemFont,
"segoe ui",
Helvetica,
Arial,
sans-serif,
"apple color emoji",
"segoe ui emoji",
"segoe ui symbol";
-apple-system,
BlinkMacSystemFont,
"segoe ui",
Helvetica,
Arial,
sans-serif,
"apple color emoji",
"segoe ui emoji",
"segoe ui symbol";
font-size: 16px;
line-height: 1.5;
word-wrap: break-word;
@ -31,8 +36,6 @@ header {
main {
margin: 0 auto;
max-width: 1080px;
width: 100%;
}
img {
@ -50,6 +53,14 @@ strong {
font-weight: 600;
}
.container {
width: 1081px;
max-width: 100%;
margin: 0 auto;
padding: 0 16px;
box-sizing: content-box;
}
.badge {
img {
width: 180px;
@ -129,10 +140,6 @@ footer {
}
@media (prefers-color-scheme: dark) {
body {
background: #121212;
color: #bbb;
}
h1,
h2,
@ -148,10 +155,6 @@ footer {
color: lightblue;
}
a:visited {
color: #f9f;
}
:root {
scrollbar-color: #333 #000;
}
@ -236,3 +239,4 @@ footer {
.back_to_news {
margin-top: 1rem;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

View file

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.2929 4.29289C13.6834 3.90237 14.3166 3.90237 14.7071 4.29289L21.7071 11.2929C21.8946 11.4804 22 11.7348 22 12C22 12.2652 21.8946 12.5196 21.7071 12.7071L14.7071 19.7071C14.3166 20.0976 13.6834 20.0976 13.2929 19.7071C12.9024 19.3166 12.9024 18.6834 13.2929 18.2929L18.5858 13L3 13C2.44772 13 2 12.5523 2 12C2 11.4477 2.44772 11 3 11L18.5858 11L13.2929 5.70711C12.9024 5.31658 12.9024 4.68342 13.2929 4.29289Z" fill="#006031"/>
</svg>

After

Width:  |  Height:  |  Size: 583 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 274 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 369 KiB

View file

@ -65,21 +65,21 @@
</head>
<body>
<header>
{% include 'top_menu.html' %}
</header>
<header>
{% include 'top_menu.html' %}
</header>
<main>
{% block content %}{% endblock %}
</main>
<main>
{% block content %}{% endblock %}
</main>
<footer>
{% include 'bottom_menu.html' %}
<p>
<span>© 2023 <a href="mailto:legal@organicmaps.app">Organic Maps OÜ</a>, reg. code 16225385</span>
<span>Harju maakond, Tallinn, Kesklinna linnaosa, Rävala pst 8-810, 10143, Estonia</span>
</p>
</footer>
<footer>
{% include 'bottom_menu.html' %}
<p>
<span>© 2023 <a href="mailto:legal@organicmaps.app">Organic Maps OÜ</a>, reg. code 16225385</span>
<span>Harju maakond, Tallinn, Kesklinna linnaosa, Rävala pst 8-810, 10143, Estonia</span>
</p>
</footer>
</body>

View file

@ -5,17 +5,17 @@
{% for page in [home, news] | concat(with=home.pages) %}
{% set translated = page.translations | filter(attribute='lang', value=lang) | first %}
{% if translated %}
{% if "_index" in translated.path %}
{% set page = get_section(path=translated.path) %}
{% else %}
{% set page = get_page(path=translated.path) %}
{% endif %}
{% if "_index" in translated.path %}
{% set page = get_section(path=translated.path) %}
{% else %}
{% set page = get_page(path=translated.path) %}
{% endif %}
{% endif %}
{% if page.extra.menu_title %}
{% if resource.path != page.path %}<a href="{{ page.permalink | replace(from=config.base_url, to="") | safe }}">{% endif %}
<span>{{ page.extra.menu_title }}</span>
{%- if resource.path != page.path %}</a>{% endif %}
<span>{{ page.extra.menu_title }}</span>
{%- if resource.path != page.path %}</a>{% endif %}
&nbsp;
{% endif %}
{% endfor %}

View file

@ -0,0 +1,18 @@
<div class="freedom__section">
<div class="container">
<div class="freedom__section__info">
<div class="freedom__section__text">
<div class="freedom__section__info__title">
Freedom Is Here
</div>
<div class="freedom__section__info__description">
Discover your journey, navigate the world with privacy and community are at the forefront.
</div>
<a class="freedom__section__info__button">
Learn more
</a>
</div>
<img src="/images/sections/search-and-plan-route-banner.png">
</div>
</div>
</div>

16
templates/hero.html Normal file
View file

@ -0,0 +1,16 @@
<div class="hero">
<div class="container">
<div class="hero__wrapper">
<div class="hero__about-us">
<div class="hero__about-us-title">
{{ resource.title }}
</div>
<div class="hero__about-us-description">
{{ resource.description }}
</div>
{% include 'ui/download-button.html' %}
</div>
<img class="hero__image" src="/images/hero/hero-image.png" alt="hero image">
</div>
</div>
</div>

11
templates/index-old.html Normal file
View file

@ -0,0 +1,11 @@
{% extends 'base.html' %}
{% block content %}
<h1>{{ resource.title }}</h1>
{{ resource.content | safe }}
{% include 'google_native_app_prompt.html' %}
{% endblock content %}

View file

@ -2,7 +2,13 @@
{% block content %}
<h1>{{ resource.title }}</h1>
{% include 'hero.html' %}
{% include 'open_map.html' %}
{% include 'site_sections.html' %}
{% include 'freedom_section.html' %}
{{ resource.content | safe }}

15
templates/open_map.html Normal file
View file

@ -0,0 +1,15 @@
<div class="open__map">
<div class="container">
<div class="open__map__info">
<img class="open__map__info__logo" src="/images/open-map/open-map-logo.png">
<div class="open__map__info__title">
Organic
</div>
<div class="open__map__info__description">
Community + Open Maps
</div>
</div>
</div>
</div>

View file

@ -0,0 +1,59 @@
<div class="sections">
<div class="container shadow">
<div class="sections__separate">
<div class="sections__separate__info">
<div class="sections__separate__info__title">
Search and Plan Route
</div>
<div class="sections__separate__info__description">
See the place you want to go while in an underground parking garage, and navigate while on a distant hike.
</div>
<a class="sections__separate__info__link">
Learn more
</a>
</div>
<img src="/images/sections/search-and-plan-route-banner.png">
</div>
</div>
<div class="container container--main">
<div class="sections__separate">
<img src="/images/sections/no-tracking-banner.png">
<div class="sections__separate__info">
<div class="sections__separate__info__title">
No Tracking or Data Collection
</div>
<div class="sections__separate__info__description">
The app is designed with privacy as a priority and does not identify users, or track information about them. </div>
<a class="sections__separate__info__link">
Learn more
</a>
</div>
</div>
<div class="sections__separate">
<div class="sections__separate__info">
<div class="sections__separate__info__title">
Save Your Battery
</div>
<div class="sections__separate__info__description">
Efficiently uses your battery, doesnt drain your battery like other navigation apps </div>
<a class="sections__separate__info__link">
Learn more
</a>
</div>
<img src="/images/sections/save-your-battery-banner.png">
</div>
<div class="sections__separate">
<img src="/images/sections/free-and-builty-by-community-banner.png">
<div class="sections__separate__info">
<div class="sections__separate__info__title">
Free and Built by the Community
</div>
<div class="sections__separate__info__description">
People like you helped build the app by adding locations to the OpenStreetMap, giving feedback on features, and contributing code </div>
<a class="sections__separate__info__link">
Learn more
</a>
</div>
</div>
</div>
</div>

View file

@ -1,36 +1,41 @@
{% set langPathPrefix = '' %}
{% if lang != config.default_language %}
{% set langPathPrefix = '/' ~ lang %}
{% set langPathPrefix = '/' ~ lang %}
{% endif %}
<nav id="menu" role="navigation">
<a href="{{ langPathPrefix | safe }}/"><span class="top_menu_logo"></span></a>
<span>
{% for page in [
get_section(path="news/_index.md"),
get_page(path="donate/index.md"),
get_page(path="support-us/index.md")
] %}
{% set translated = page.translations | filter(attribute='lang', value=lang) | first %}
{% if translated %}
{% if "_index" in translated.path %}
{% set page = get_section(path=translated.path) %}
{% else %}
{% set page = get_page(path=translated.path) %}
{% endif %}
{% endif %}
<span class="top_menu_{{ page.path | split(pat="/") | reverse | nth(n=1) }} top_menu_item{% if page.path != resource.path %}">
<a href="{{ page.permalink | replace(from=config.base_url, to="") | safe }}">{% else %}_active">{% endif %}
<span>{{ page.extra.menu_title }}</span>
{%- if page.path != resource.path %}</a>{% endif %}
</span>
{% endfor %}
<span class="top_menu_item">
<a href="https://github.com/organicmaps/organicmaps" target="_blank" class="top_menu_github">
<span>GitHub</span>
</a>
</span>
{% include 'language_selector.html' %}
</span>
<nav class="top-menu" id="menu" role="navigation">
<div class="container">
<div class="top-menu__wrapper">
<a href="{{ langPathPrefix | safe }}/"><span>{% include 'ui/logo.html' %}</span></a>
<span class="top-menu__cta">
<span class="top-menu__links">
{% for page in [
get_section(path="news/_index.md"),
get_page(path="donate/index.md"),
get_page(path="support-us/index.md")
] %}
{% set translated = page.translations | filter(attribute='lang', value=lang) | first %}
{% if translated %}
{% if "_index" in translated.path %}
{% set page = get_section(path=translated.path) %}
{% else %}
{% set page = get_page(path=translated.path) %}
{% endif %}
{% endif %}
<span class="top-menu__{{ page.path | split(pat="/") | reverse | nth(n=1) }} top-menu__item{% if page.path != resource.path %}">
<a href="{{ page.permalink | replace(from=config.base_url, to="") | safe }}">{% else %}_active">{% endif %}
{{ page.extra.menu_title }}
{%- if page.path != resource.path %}</a>{% endif %}
</span>
{% endfor %}
<span class="top-menu__item">
<a href="https://github.com/organicmaps/organicmaps" target="_blank" class="top-menu__github">
GitHub
</a>
</span>
</span>
{% include 'ui/download-button.html' %}
</span>
</div>
</div>
</nav>

View file

@ -0,0 +1 @@
<a class="download-button" href="http://download.com">Download</a>

14
templates/ui/logo.html Normal file
View file

@ -0,0 +1,14 @@
<svg xmlns="http://www.w3.org/2000/svg" width="196" height="40" viewBox="0 0 196 40" fill="none">
<path d="M62.401 20.0337C62.401 21.9002 62.0514 23.4989 61.3522 24.8297C60.6586 26.1549 59.7112 27.1699 58.5101 27.8748C57.3146 28.5797 55.9584 28.9321 54.4415 28.9321C52.9246 28.9321 51.5656 28.5797 50.3644 27.8748C49.169 27.1643 48.2216 26.1464 47.5223 24.8213C46.8287 23.4904 46.4819 21.8946 46.4819 20.0337C46.4819 18.1671 46.8287 16.5713 47.5223 15.2461C48.2216 13.9153 49.169 12.8974 50.3644 12.1926C51.5656 11.4877 52.9246 11.1352 54.4415 11.1352C55.9584 11.1352 57.3146 11.4877 58.5101 12.1926C59.7112 12.8974 60.6586 13.9153 61.3522 15.2461C62.0514 16.5713 62.401 18.1671 62.401 20.0337ZM59.246 20.0337C59.246 18.7198 59.0401 17.6117 58.6285 16.7094C58.2225 15.8016 57.6586 15.1164 56.9368 14.654C56.215 14.186 55.3832 13.9519 54.4415 13.9519C53.4998 13.9519 52.668 14.186 51.9462 14.654C51.2244 15.1164 50.6577 15.8016 50.246 16.7094C49.84 17.6117 49.637 18.7198 49.637 20.0337C49.637 21.3476 49.84 22.4585 50.246 23.3664C50.6577 24.2686 51.2244 24.9538 51.9462 25.4218C52.668 25.8842 53.4998 26.1154 54.4415 26.1154C55.3832 26.1154 56.215 25.8842 56.9368 25.4218C57.6586 24.9538 58.2225 24.2686 58.6285 23.3664C59.0401 22.4585 59.246 21.3476 59.246 20.0337Z" fill="white"/>
<path d="M64.518 28.6953V15.7029H67.4869V17.8683H67.6223C67.8591 17.1183 68.2651 16.5403 68.8403 16.1343C69.4211 15.7226 70.0837 15.5168 70.8281 15.5168C70.9973 15.5168 71.1862 15.5252 71.3948 15.5422C71.6091 15.5534 71.7867 15.5732 71.9277 15.6014V18.4181C71.798 18.373 71.5922 18.3335 71.3102 18.2997C71.0339 18.2602 70.7661 18.2405 70.5067 18.2405C69.9484 18.2405 69.4465 18.3617 69.001 18.6042C68.5612 18.841 68.2144 19.1709 67.9606 19.5938C67.7069 20.0168 67.58 20.5045 67.58 21.0572V28.6953H64.518Z" fill="white"/>
<path d="M78.3628 33.8381C77.2631 33.8381 76.3186 33.6887 75.5291 33.3898C74.7397 33.0966 74.1053 32.7019 73.6259 32.2056C73.1466 31.7094 72.8139 31.1596 72.6278 30.5562L75.3853 29.888C75.5094 30.1417 75.6898 30.3927 75.9267 30.6408C76.1635 30.8945 76.4821 31.1032 76.8825 31.2667C77.2885 31.4359 77.7989 31.5205 78.4135 31.5205C79.2819 31.5205 80.0009 31.309 80.5705 30.8861C81.14 30.4688 81.4248 29.7808 81.4248 28.8222V26.3607H81.2725C81.1146 26.6765 80.8834 27.0008 80.5789 27.3335C80.28 27.6662 79.8825 27.9453 79.3863 28.1709C78.8957 28.3964 78.2782 28.5092 77.5338 28.5092C76.5357 28.5092 75.6306 28.2752 74.8186 27.8071C74.0122 27.3335 73.3694 26.6286 72.89 25.6925C72.4164 24.7508 72.1795 23.5722 72.1795 22.1568C72.1795 20.7301 72.4164 19.5262 72.89 18.545C73.3694 17.5581 74.015 16.811 74.8271 16.3034C75.6391 15.7903 76.5442 15.5337 77.5423 15.5337C78.3035 15.5337 78.9295 15.6634 79.4201 15.9228C79.9163 16.1766 80.3111 16.4839 80.6043 16.8448C80.8975 17.2 81.1203 17.5356 81.2725 17.8514H81.4417V15.7029H84.4614V28.9068C84.4614 30.0177 84.1964 30.9368 83.6663 31.6643C83.1362 32.3917 82.4116 32.9359 81.4924 33.2968C80.5733 33.6577 79.53 33.8381 78.3628 33.8381ZM78.3881 26.107C79.0366 26.107 79.5893 25.9491 80.046 25.6333C80.5028 25.3175 80.8496 24.8635 81.0864 24.2714C81.3233 23.6793 81.4417 22.9688 81.4417 22.1399C81.4417 21.3222 81.3233 20.606 81.0864 19.9914C80.8552 19.3767 80.5112 18.9002 80.0545 18.5619C79.6034 18.2179 79.0479 18.0459 78.3881 18.0459C77.7058 18.0459 77.1363 18.2235 76.6795 18.5788C76.2227 18.9341 75.8787 19.4218 75.6475 20.0421C75.4163 20.6568 75.3007 21.356 75.3007 22.1399C75.3007 22.935 75.4163 23.6314 75.6475 24.2292C75.8844 24.8213 76.2312 25.2837 76.688 25.6164C77.1504 25.9434 77.7171 26.107 78.3881 26.107Z" fill="white"/>
<path d="M90.6237 28.9575C89.8004 28.9575 89.0588 28.8109 88.3991 28.5177C87.7449 28.2188 87.2261 27.7789 86.8427 27.1981C86.4649 26.6173 86.276 25.9011 86.276 25.0496C86.276 24.3166 86.4113 23.7104 86.682 23.231C86.9526 22.7517 87.322 22.3683 87.79 22.0807C88.2581 21.7931 88.7853 21.576 89.3718 21.4294C89.9639 21.2771 90.5757 21.1671 91.2073 21.0995C91.9686 21.0205 92.5861 20.95 93.0598 20.888C93.5334 20.8203 93.8774 20.7188 94.0917 20.5835C94.3116 20.4425 94.4216 20.2254 94.4216 19.9322V19.8814C94.4216 19.2442 94.2327 18.7508 93.8549 18.4012C93.477 18.0515 92.9329 17.8767 92.2224 17.8767C91.4724 17.8767 90.8774 18.0403 90.4376 18.3673C90.0034 18.6944 89.7102 19.0807 89.5579 19.5262L86.6989 19.1202C86.9244 18.3307 87.2966 17.6709 87.8154 17.1408C88.3342 16.6051 88.9686 16.2048 89.7186 15.9397C90.4686 15.669 91.2975 15.5337 92.2054 15.5337C92.8314 15.5337 93.4545 15.607 94.0748 15.7536C94.6951 15.9002 95.2618 16.1427 95.775 16.4811C96.2881 16.8138 96.6998 17.2677 97.0099 17.8429C97.3257 18.4181 97.4836 19.1371 97.4836 19.9998V28.6953H94.54V26.9105H94.4385C94.2524 27.2714 93.9902 27.6098 93.6519 27.9256C93.3192 28.2357 92.899 28.4866 92.3915 28.6784C91.8897 28.8645 91.3004 28.9575 90.6237 28.9575ZM91.4188 26.7075C92.0335 26.7075 92.5663 26.5863 93.0175 26.3438C93.4686 26.0957 93.8154 25.7686 94.0579 25.3626C94.306 24.9566 94.43 24.5139 94.43 24.0346V22.5036C94.3342 22.5825 94.1707 22.6558 93.9395 22.7235C93.7139 22.7912 93.4601 22.8504 93.1782 22.9011C92.8962 22.9519 92.6171 22.997 92.3408 23.0365C92.0645 23.076 91.8248 23.1098 91.6218 23.138C91.165 23.2 90.7562 23.3015 90.3953 23.4425C90.0344 23.5835 89.7496 23.7808 89.541 24.0346C89.3323 24.2827 89.228 24.6041 89.228 24.9989C89.228 25.5628 89.4338 25.9885 89.8455 26.2761C90.2571 26.5637 90.7816 26.7075 91.4188 26.7075Z" fill="white"/>
<path d="M102.91 21.0826V28.6953H99.848V15.7029H102.775V17.9106H102.927C103.226 17.1831 103.702 16.6051 104.356 16.1766C105.016 15.748 105.831 15.5337 106.801 15.5337C107.698 15.5337 108.479 15.7254 109.144 16.1089C109.815 16.4923 110.334 17.0478 110.7 17.7752C111.073 18.5027 111.256 19.3852 111.25 20.4228V28.6953H108.188V20.8965C108.188 20.028 107.963 19.3485 107.511 18.8579C107.066 18.3673 106.448 18.122 105.659 18.122C105.123 18.122 104.647 18.2405 104.23 18.4773C103.818 18.7085 103.494 19.044 103.257 19.4839C103.026 19.9237 102.91 20.4566 102.91 21.0826Z" fill="white"/>
<path d="M113.648 28.6953V15.7029H116.71V28.6953H113.648ZM115.188 13.8589C114.703 13.8589 114.286 13.6982 113.936 13.3768C113.586 13.0497 113.412 12.6578 113.412 12.201C113.412 11.7386 113.586 11.3467 113.936 11.0253C114.286 10.6982 114.703 10.5347 115.188 10.5347C115.678 10.5347 116.096 10.6982 116.44 11.0253C116.789 11.3467 116.964 11.7386 116.964 12.201C116.964 12.6578 116.789 13.0497 116.44 13.3768C116.096 13.6982 115.678 13.8589 115.188 13.8589Z" fill="white"/>
<path d="M124.812 28.9491C123.515 28.9491 122.401 28.6643 121.471 28.0947C120.546 27.5252 119.832 26.7385 119.331 25.7348C118.834 24.7254 118.586 23.5637 118.586 22.2498C118.586 20.9303 118.84 19.7658 119.348 18.7564C119.855 17.7414 120.571 16.9519 121.496 16.388C122.426 15.8185 123.526 15.5337 124.795 15.5337C125.849 15.5337 126.783 15.7283 127.595 16.1173C128.412 16.5008 129.064 17.045 129.549 17.7499C130.034 18.4491 130.31 19.2668 130.378 20.2029H127.451C127.332 19.5769 127.05 19.0553 126.605 18.638C126.165 18.2151 125.576 18.0036 124.837 18.0036C124.211 18.0036 123.661 18.1728 123.188 18.5111C122.714 18.8438 122.345 19.3232 122.08 19.9491C121.82 20.575 121.691 21.325 121.691 22.1991C121.691 23.0844 121.82 23.8457 122.08 24.4829C122.339 25.1145 122.703 25.6023 123.171 25.9462C123.644 26.2846 124.2 26.4538 124.837 26.4538C125.288 26.4538 125.691 26.3692 126.047 26.2C126.408 26.0252 126.709 25.7743 126.952 25.4472C127.194 25.1201 127.361 24.7226 127.451 24.2545H130.378C130.304 25.1737 130.034 25.9885 129.566 26.6991C129.097 27.4039 128.46 27.9566 127.654 28.357C126.847 28.7517 125.9 28.9491 124.812 28.9491Z" fill="white"/>
<path d="M137.506 11.3721H141.347L146.489 23.9246H146.692L151.835 11.3721H155.675V28.6953H152.664V16.794H152.503L147.716 28.6445H145.466L140.678 16.7687H140.518V28.6953H137.506V11.3721Z" fill="white"/>
<path d="M161.981 28.9575C161.158 28.9575 160.417 28.8109 159.757 28.5177C159.103 28.2188 158.584 27.7789 158.201 27.1981C157.823 26.6173 157.634 25.9011 157.634 25.0496C157.634 24.3166 157.769 23.7104 158.04 23.231C158.31 22.7517 158.68 22.3683 159.148 22.0807C159.616 21.7931 160.143 21.576 160.73 21.4294C161.322 21.2771 161.934 21.1671 162.565 21.0995C163.326 21.0205 163.944 20.95 164.418 20.888C164.891 20.8203 165.235 20.7188 165.45 20.5835C165.669 20.4425 165.779 20.2254 165.779 19.9322V19.8814C165.779 19.2442 165.591 18.7508 165.213 18.4012C164.835 18.0515 164.291 17.8767 163.58 17.8767C162.83 17.8767 162.235 18.0403 161.795 18.3673C161.361 18.6944 161.068 19.0807 160.916 19.5262L158.057 19.1202C158.282 18.3307 158.654 17.6709 159.173 17.1408C159.692 16.6051 160.326 16.2048 161.076 15.9397C161.826 15.669 162.655 15.5337 163.563 15.5337C164.189 15.5337 164.812 15.607 165.433 15.7536C166.053 15.9002 166.62 16.1427 167.133 16.4811C167.646 16.8138 168.058 17.2677 168.368 17.8429C168.684 18.4181 168.841 19.1371 168.841 19.9998V28.6953H165.898V26.9105H165.796C165.61 27.2714 165.348 27.6098 165.01 27.9256C164.677 28.2357 164.257 28.4866 163.749 28.6784C163.247 28.8645 162.658 28.9575 161.981 28.9575ZM162.777 26.7075C163.391 26.7075 163.924 26.5863 164.375 26.3438C164.826 26.0957 165.173 25.7686 165.416 25.3626C165.664 24.9566 165.788 24.5139 165.788 24.0346V22.5036C165.692 22.5825 165.528 22.6558 165.297 22.7235C165.072 22.7912 164.818 22.8504 164.536 22.9011C164.254 22.9519 163.975 22.997 163.699 23.0365C163.422 23.076 163.183 23.1098 162.98 23.138C162.523 23.2 162.114 23.3015 161.753 23.4425C161.392 23.5835 161.107 23.7808 160.899 24.0346C160.69 24.2827 160.586 24.6041 160.586 24.9989C160.586 25.5628 160.792 25.9885 161.203 26.2761C161.615 26.5637 162.139 26.7075 162.777 26.7075Z" fill="white"/>
<path d="M171.206 33.5675V15.7029H174.217V17.8514H174.395C174.553 17.5356 174.775 17.2 175.063 16.8448C175.351 16.4839 175.74 16.1766 176.23 15.9228C176.721 15.6634 177.347 15.5337 178.108 15.5337C179.112 15.5337 180.017 15.7903 180.823 16.3034C181.635 16.811 182.278 17.5638 182.752 18.5619C183.231 19.5544 183.471 20.7724 183.471 22.216C183.471 23.6427 183.237 24.8551 182.769 25.8532C182.301 26.8513 181.663 27.6126 180.857 28.137C180.051 28.6615 179.137 28.9237 178.116 28.9237C177.372 28.9237 176.755 28.7996 176.264 28.5515C175.773 28.3034 175.379 28.0045 175.08 27.6549C174.787 27.2996 174.558 26.9641 174.395 26.6483H174.268V33.5675H171.206ZM174.209 22.1991C174.209 23.0393 174.327 23.7752 174.564 24.4068C174.806 25.0384 175.153 25.5318 175.604 25.887C176.061 26.2367 176.614 26.4115 177.262 26.4115C177.939 26.4115 178.506 26.231 178.962 25.8701C179.419 25.5036 179.763 25.0045 179.994 24.3729C180.231 23.7357 180.35 23.0111 180.35 22.1991C180.35 21.3927 180.234 20.6765 180.003 20.0506C179.772 19.4247 179.428 18.9341 178.971 18.5788C178.514 18.2235 177.944 18.0459 177.262 18.0459C176.608 18.0459 176.053 18.2179 175.596 18.5619C175.139 18.9059 174.792 19.388 174.555 20.0083C174.324 20.6286 174.209 21.3589 174.209 22.1991Z" fill="white"/>
<path d="M195.647 19.1371L192.856 19.4416C192.777 19.1596 192.639 18.8946 192.441 18.6465C192.25 18.3984 191.99 18.1982 191.663 18.0459C191.336 17.8937 190.936 17.8175 190.462 17.8175C189.825 17.8175 189.289 17.9557 188.855 18.232C188.426 18.5083 188.215 18.8664 188.22 19.3062C188.215 19.6841 188.353 19.9914 188.635 20.2282C188.923 20.4651 189.396 20.6596 190.056 20.8119L192.272 21.2856C193.501 21.5506 194.415 21.9707 195.013 22.5459C195.616 23.1211 195.921 23.8739 195.926 24.8043C195.921 25.622 195.681 26.3438 195.207 26.9697C194.739 27.59 194.088 28.075 193.253 28.4246C192.419 28.7742 191.46 28.9491 190.377 28.9491C188.787 28.9491 187.507 28.6163 186.537 27.9509C185.567 27.2799 184.989 26.3466 184.803 25.1511L187.789 24.8635C187.924 25.45 188.212 25.8927 188.652 26.1915C189.092 26.4904 189.664 26.6399 190.369 26.6399C191.096 26.6399 191.68 26.4904 192.12 26.1915C192.565 25.8927 192.788 25.5233 192.788 25.0835C192.788 24.7113 192.644 24.404 192.357 24.1615C192.075 23.919 191.635 23.7329 191.037 23.6032L188.821 23.138C187.575 22.8786 186.653 22.4416 186.055 21.8269C185.457 21.2066 185.161 20.4228 185.167 19.4754C185.161 18.6747 185.378 17.9811 185.818 17.3946C186.264 16.8025 186.881 16.3457 187.671 16.0243C188.466 15.6972 189.382 15.5337 190.42 15.5337C191.942 15.5337 193.141 15.858 194.015 16.5064C194.894 17.1549 195.438 18.0318 195.647 19.1371Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M35.0932 16.1306C35.0932 26.587 22.2411 37.8284 19.8138 39.8582C19.5856 40.049 19.2572 40.0469 19.0309 39.8539C17.4868 38.5365 11.6912 33.3967 7.69826 27.1975C3.69453 28.4611 0.862033 28.6386 0.163958 27.4295C-1.00695 25.4014 4.20305 20.1232 12.2937 14.8227C18.228 16.7694 21.8732 12.4306 24.404 9.4182C25.1616 8.51648 25.8193 7.73361 26.4087 7.27373C26.6361 7.09635 26.6405 6.65146 26.3776 6.53293C18.6982 3.07025 11.707 5.35142 10.9532 11.6612C10.9223 11.9196 11.2085 12.0849 11.4278 11.9449C14.3796 10.0609 17.767 8.67082 20.321 8.0152C20.6817 7.92261 20.7646 8.28422 20.418 8.4203C18.0014 9.36899 15.5816 10.6732 13.4147 12.0212C13.4026 12.0209 13.3903 12.0238 13.3793 12.0303C9.6141 14.2702 6.39246 16.5966 4.00876 18.7314C3.83995 17.8599 3.74857 16.9908 3.74857 16.1306C3.74857 7.22192 10.7653 0 19.4209 0C24.0851 0 28.2734 2.09709 31.1444 5.42515C35.1477 4.16176 37.9799 3.98442 38.6779 5.19344C39.6158 6.81802 36.4593 10.5281 31.0074 14.6646C29.696 15.7026 28.1396 16.803 26.397 17.9151C20.5515 16.0902 16.9467 20.381 14.4373 23.3678C13.6797 24.2695 13.022 25.0524 12.4326 25.5123C12.2053 25.6897 12.2008 26.1346 12.4637 26.2531C20.1432 29.7158 27.1343 27.4346 27.8882 21.1249C27.919 20.8664 27.6329 20.7011 27.4135 20.8411C24.4618 22.7252 21.0743 24.1152 18.5203 24.7708C18.1596 24.8634 18.0767 24.5018 18.4234 24.3657C20.8431 23.4158 23.2661 22.1093 25.4352 20.7595C25.4446 20.7586 25.4539 20.7557 25.4623 20.7507C29.2898 18.4737 32.5556 16.1075 34.9504 13.9439C35.0446 14.659 35.0932 15.3889 35.0932 16.1306ZM33.887 9.91405C35.1507 8.61626 35.7321 7.61091 35.4216 7.07311C35.118 6.54731 34.0011 6.5363 32.3106 6.95241C32.9315 7.87438 33.4615 8.86618 33.887 9.91405ZM5.175 22.486C3.75963 23.891 3.09251 24.9808 3.42051 25.5489C3.73615 26.0956 4.931 26.0858 6.73576 25.618C6.14681 24.5917 5.61807 23.5438 5.175 22.486Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 14 KiB