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

Use new colors for grade status chip #6674

Merged
merged 1 commit into from
Sep 11, 2024
+18 −12
Merged

Use new colors for grade status chip #6674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions lms/static/scripts/frontend_apps/components/dashboard/GradeStatusChip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,12 @@ export default function GradeStatusChip({ grade }: GradeStatusChipProps) {

return (
<div
className={classnames('rounded font-bold inline-block px-2 py-0.5', {
// We would usually use our standard `green-success` and `red-error`
// colors here, but they don't have enough contrast when used with
// white text and a small font.
// Instead, we use slightly darker shades of green and red.
'bg-[#008558] text-white': grade === 100,
'bg-[#D7373A] text-white': grade === 0,
'bg-green-200 text-green-900': grade >= 80 && grade < 100,
'bg-amber-100 text-amber-900': grade >= 50 && grade < 80,
'bg-red-200 text-red-900': grade >= 1 && grade < 50,
className={classnames('rounded inline-block font-bold px-2 py-0.5', {
'bg-grade-success text-white': grade === 100,
'bg-grade-success-light text-grade-success': grade >= 80 && grade < 100,
'bg-grade-warning-light text-grade-warning': grade >= 50 && grade < 80,
'bg-grade-error-light text-grade-error': grade >= 1 && grade < 50,
'bg-grade-error text-white': grade === 0,
'bg-grey-3 text-grey-7': gradeIsInvalid,
})}
>
Expand Down
14 changes: 12 additions & 2 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import tailwindConfig from '@hypothesis/frontend-shared/lib/tailwind.preset.js';
const successGreen =
tailwindConfig.theme?.extend?.colors?.green?.success ?? '#00a36d';

export default {
export default /** @type {Partial<import('tailwindcss').Config>} */ ({
presets: [tailwindConfig],
content: [
'./lms/static/scripts/frontend_apps/**/*.{js,ts,tsx}',
Expand All @@ -17,6 +17,16 @@ export default {
animation: {
gradeSubmitSuccess: 'gradeSubmitSuccess 2s ease-out forwards',
},
colors: {
grade: {
success: '#005c3d',
'success-light': '#dfebe7',
error: '#891b1d',
'error-light': '#f0e2e3',
warning: '#774903',
'warning-light': '#fef7ec',
},
},
fontFamily: {
sans: [
'"Helvetica Neue"',
Expand All @@ -37,4 +47,4 @@ export default {
},
},
},
};
});
Loading