RomanNum3ral
/
vert
mirror of https://github.com/VERT-sh/VERT.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: broken conflict merge 

why does github's web conflict resolver not have highlighting
This commit is contained in:
Maya 2025-10-20 06:09:18 +03:00
parent 9ccf5440c2
commit e7ff0f23af
No known key found for this signature in database
1 changed files with 23 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/lib/sections/about/Credits.svelte
View File

@ -101,61 +101,43 @@
</h2> </h2>
{#if ghContribs && ghContribs.length > 0} {#if ghContribs && ghContribs.length > 0}
<p class="text-base text-muted font-normal"> <p class="text-base text-muted font-normal">
{@html link( {@html sanitize(
"github_link", link(
m["about.credits.github_description"](), "github_link",
GITHUB_URL_VERT, m["about.credits.github_description"](),
true GITHUB_URL_VERT,
true,
),
)} )}
</p> </p>
{:else} {:else}
<p class="text-base text-muted font-normal italic"> <p class="text-base text-muted font-normal italic">
{@html link( {@html sanitize(
"contribute_link", link(
m["about.credits.no_contributors"](), "contribute_link",
GITHUB_URL_VERT, m["about.credits.no_contributors"](),
GITHUB_URL_VERT,
true,
),
)} )}
</p> </p>
{/if} {/if}
</div> </div>
{#if ghContribs && ghContribs.length > 0} {#if ghContribs && ghContribs.length > 0}
<p class="text-base text-muted font-normal"> <div class="flex flex-row flex-wrap gap-2">
{@html sanitize( {#each ghContribs as contrib}
link( {@const { name, github, avatar } = contrib}
"github_link", {@render contributor(name, github, avatar)}
m["about.credits.github_description"](), {/each}
GITHUB_URL_VERT, </div>
true,
),
)}
</p>
{:else}
<p class="text-base text-muted font-normal italic">
{@html sanitize(
link(
"contribute_link",
m["about.credits.no_contributors"](),
GITHUB_URL_VERT,
true,
),
)}
</p>
{/if} {/if}
</div> </div>
{#if ghContribs && ghContribs.length > 0}
<div class="flex flex-row flex-wrap gap-2">
{#each ghContribs as contrib}
{@const { name, github, avatar } = contrib}
{@render contributor(name, github, avatar)}
{/each}
</div>
{/if}
<h2 class="mt-2 -mb-2">{m["about.credits.libraries"]()}</h2> <h2 class="mt-2 -mb-2">{m["about.credits.libraries"]()}</h2>
<p class="font-normal"> <p class="font-normal">
{m["about.credits.libraries_description"]()} {m["about.credits.libraries_description"]()}
</p> </p>
</div> {/if}
</div></Panel </div>
> </Panel>