Skip to content

Commit c5f3441

Browse files
committed
Merge remote-tracking branch 'origin' into 2025.7.2-ee-ce-migration
2 parents 2a5baa5 + 9f8359f commit c5f3441

File tree

116 files changed

+460
-52
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+460
-52
lines changed

src/.vitepress/config.mts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ export default defineConfig({
3232
light: "/MM_symbol_COLOR_no_padding.svg",
3333
},
3434

35-
socialLinks: [{ icon: "github", link: "https://github.com/MerginMaps" }],
36-
3735
editLink: {
3836
pattern: "https://github.com/merginmaps/docs/edit/main/src/:path",
3937
text: "Help us improve this page!",

src/.vitepress/theme/components/PageFooter.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@
2727
</div>
2828
<div class="page-footer__center">
2929
<div>
30+
<SocialIconsLink icon="bluesky" class="page-footer__icon" />
31+
<SocialIconsLink icon="slack" class="page-footer__icon" />
3032
<SocialIconsLink icon="linkedin" class="page-footer__icon" />
31-
<SocialIconsLink icon="twitter" class="page-footer__icon" />
33+
<SocialIconsLink icon="facebook" class="page-footer__icon" />
3234
<SocialIconsLink icon="github" class="page-footer__icon" />
35+
<SocialIconsLink icon="youtube" class="page-footer__icon" />
36+
<SocialIconsLink icon="mastodon" class="page-footer__icon" />
3337
</div>
3438
<div>
3539
<a href="https://merginmaps.com/cookies" target="__blank"
@@ -120,6 +124,7 @@ const darkMode = computed(() => data.isDark.value);
120124
display: flex;
121125
align-items: center;
122126
flex-direction: column;
127+
gap: 0.75rem;
123128
}
124129
}
125130
@media screen and (max-width: 911px) {

src/.vitepress/theme/components/SocialIconsLink.vue

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,48 @@
11
<template>
2-
<a :href="href" target="__blank" aria-label="Social link">
3-
<span>
4-
<svg height="1em" viewBox="0 0 496 512" fill="currentColor">
5-
<path
6-
v-if="icon === 'github'"
7-
d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"
8-
/>
9-
<path
10-
v-else-if="icon === 'twitter'"
11-
d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"
12-
/>
13-
<path
14-
v-else-if="icon === 'linkedin'"
15-
d="M416 32H31.9C14.3 32 0 46.5 0 64.3v383.4C0 465.5 14.3 480 31.9 480H416c17.6 0 32-14.5 32-32.3V64.3c0-17.8-14.4-32.3-32-32.3zM135.4 416H69V202.2h66.5V416zm-33.2-243c-21.3 0-38.5-17.3-38.5-38.5S80.9 96 102.2 96c21.2 0 38.5 17.3 38.5 38.5 0 21.3-17.2 38.5-38.5 38.5zm282.1 243h-66.4V312c0-24.8-.5-56.7-34.5-56.7-34.6 0-39.9 27-39.9 54.9V416h-66.4V202.2h63.7v29.2h.9c8.9-16.8 30.6-34.5 62.9-34.5 67.2 0 79.7 44.3 79.7 101.9V416z"
16-
/>
17-
</svg>
18-
</span>
2+
<a :href="href" target="_blank" rel="noopener" aria-label="Social link">
3+
<span v-if="svgRaw" v-html="svgRaw" />
194
</a>
205
</template>
216

227
<script>
238
import { defineComponent } from "vue";
249
10+
import githubSvg from "/socials/github.svg?raw";
11+
import linkedinSvg from "/socials/linkedin.svg?raw";
12+
import slackSvg from "/socials/slack.svg?raw";
13+
import blueskySvg from "/socials/bluesky.svg?raw";
14+
import facebookSvg from "/socials/facebook.svg?raw";
15+
import youtubeSvg from "/socials/youtube.svg?raw";
16+
import mastodonSvg from "/socials/mastodon.svg?raw";
17+
2518
export default defineComponent({
26-
name: "SocialIconsLink",
27-
props: {
28-
icon: { type: String, required: true },
29-
},
19+
props: { icon: { type: String, required: true } },
3020
computed: {
3121
href() {
3222
const mapper = {
3323
github: "https://github.com/MerginMaps",
34-
twitter: "https://twitter.com/MerginMaps",
3524
linkedin: "https://www.linkedin.com/company/mergin-maps/",
25+
bluesky: "https://bsky.app/profile/merginmaps.bsky.social",
26+
slack: "https://merginmaps.com/community/join",
27+
facebook: "https://www.facebook.com/profile.php?id=61564969364057",
28+
youtube: "https://www.youtube.com/@merginmaps",
29+
mastodon: "https://fosstodon.org/@merginmaps",
3630
};
3731
3832
return mapper[this.icon];
3933
},
34+
svgRaw() {
35+
const icons = {
36+
github: githubSvg,
37+
linkedin: linkedinSvg,
38+
slack: slackSvg,
39+
facebook: facebookSvg,
40+
bluesky: blueskySvg,
41+
youtube: youtubeSvg,
42+
mastodon: mastodonSvg,
43+
};
44+
return icons[this.icon] || null;
45+
},
4046
},
4147
});
4248
</script>

src/dev/customapp/index.md

Lines changed: 4 additions & 0 deletions

src/dev/dbsync/index.md

Lines changed: 4 additions & 0 deletions

src/dev/geodiff/index.md

Lines changed: 4 additions & 0 deletions

src/dev/integration-cpp/index.md

Lines changed: 4 additions & 0 deletions

src/dev/integration/index.md

Lines changed: 1 addition & 0 deletions

src/dev/media-sync/index.md

Lines changed: 4 additions & 0 deletions

src/dev/work-packages/index.md

Lines changed: 4 additions & 0 deletions

0 commit comments

Comments
 (0)