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.

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

feat(game): unify softcore and progress styles with other pages #2060

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion public/gameInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ function generateBucketLabelsAndValues(int $numAchievements, array $buckets): ar
'height': '78%'
},
height: 260,
colors: ['#cc9900', '#186DEE'],
colors: ['#cc9900', '#737373'],
pointSize: 4,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,22 @@
aria-valuemax="100"
aria-valuenow="{{ $unlockRate }}"
aria-labelledby="progress-label-{{ $achievement['ID'] }}"
class="w-full h-1 bg-embed rounded flex"
class="w-full h-1 bg-zinc-950 light:bg-zinc-300 rounded flex space-x-px"
>
<!-- Hardcore completion -->
{{-- Hardcore completion --}}
<div
style="width: {{ $hardcoreProgressBarWidth }}%"
class="bg-[#cc9900] h-full {{ $hardcoreProgressBarWidth > 0 ? "rounded-l" : "" }}"
class="bg-gradient-to-r from-amber-500 to-[gold] light:bg-yellow-500 h-full {{ $hardcoreProgressBarWidth > 0 ? "rounded-l" : "" }}"
>
<span class="sr-only">
{{ $hardcoreProgressBarWidth }}% of players have earned the achievement in hardcore mode
</span>
</div>

<!-- Softcore completion -->
{{-- Softcore completion --}}
<div
style="width: {{ $softcoreProgressBarWidth }}%"
class="bg-[rgb(11,113,193)] h-full {{ $hardcoreProgressBarWidth === 0 ? "rounded-l" : "" }}"
class="bg-neutral-500 h-full {{ $hardcoreProgressBarWidth === 0 ? "rounded-l" : "" }}"
>
<span class="sr-only">
{{ $softcoreUnlockRate }}% of players have earned the achievement in softcore mode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class="absolute w-full bottom-0 left-0 h-2 bg-embed-highlight lg:rounded-b flex"

<!-- Hardcore progress bar -->
<div
class="bg-yellow-600 h-full lg:rounded-bl {{ $hardcoreProgressWidth === 100 ? 'lg:rounded-br' : '' }}"
class="bg-yellow-500 h-full lg:rounded-bl {{ $hardcoreProgressWidth === 100 ? 'lg:rounded-br' : '' }}"
style="width: {{ $hardcoreProgressWidth }}%"
>
<span class="sr-only">{{ $numEarnedHardcoreAchievements }} hardcore achievements</span>
Expand Down
Loading