Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make version FROM consistent and move to first item ahead of category. #116

Merged
merged 2 commits into from
Sep 25, 2024
Merged

Make version FROM consistent and move to first item ahead of category. #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
362688a
Make version FROM consistant and move to first item ahead of category.
marcpems Sep 25, 2024
2538c4b
Merge branch 'staging' into marcpe_staging
marcpems Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/components/Projects/ApplicationDetails.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@ const { Content } = await render();
</div>

<ul class="flex flex-row flex-wrap gap-x-16 gap-y-6">
{
version_from && (
<li>
<b data-pagefind-ignore>Version From: </b>
<span data-pagefind-meta="version_from">{version_from}</span>
</li>
)
}

<li>
<b data-pagefind-ignore>Categories: </b>
{
Expand All @@ -84,14 +93,6 @@ const { Content } = await render();
)
}
</li>
{
version_from && (
<li>
<b data-pagefind-ignore>Version From: </b>
<span data-pagefind-meta="version_from">{version_from}</span>
</li>
)
}
{
() => {
if (link)
Expand Down
12 changes: 6 additions & 6 deletions src/components/Projects/ApplicationListing.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ const url = `/applications/${slug}/`;
}
}
</p>


<p class="break-all text-orange-200">
<b>Version From:&nbsp;</b>
<span class="min-w-0">{data.version_from}</span>
</p>

<p class="px-3 flex flex-wrap">
<b>Categories: </b>
<span class="px-3 flex flex-wrap gap-1">
Expand All @@ -80,11 +85,6 @@ const url = `/applications/${slug}/`;
}
</span>
</p>

<p class="break-all text-orange-200">
<b>Version:&nbsp;</b>
<span class="min-w-0">{data.version_from}</span>
</p>
</div>
</div>
</article>
Expand Down
15 changes: 8 additions & 7 deletions src/components/Search/Results.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ const Result = ({
</span>
</p>
</Show>

<Show when={type === "applications"}>
<p class="break-all text-orange-200">
<b>Version from:&nbsp;</b>
<span class="min-w-0">{project()?.meta.version_from}</span>
</p>
</Show>

<Show when={type === "applications"}>
<p class="flex gap-2 flex-wrap">
<b>Categories: </b>
Expand All @@ -130,13 +138,6 @@ const Result = ({
</p>
</Show>

<Show when={type === "applications"}>
<p class="break-all text-orange-200">
<b>Version:&nbsp;</b>
<span class="min-w-0">{project()?.meta.version_from}</span>
</p>
</Show>

<Show when={type === "games"}>
<p>
<b>Compatibility: </b>
Expand Down
2 changes: 1 addition & 1 deletion src/content/applications/DavinciResolve.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "Davinci Resolve"
categories: ['creative']
compatibility: native
display_result: "Compatible"
version_from: "19"
version_from: "19.0.0"
featured: true
link: https://www.blackmagicdesign.com/products/davinciresolve/
icon: DavinciResolve.jfif
Expand Down
Loading