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

feat(progress): add missing colors for Progress component #1129

Merged
merged 1 commit into from
Nov 12, 2023
Merged

feat(progress): add missing colors for Progress component #1129

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
36 changes: 33 additions & 3 deletions examples/progress/progress.colors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function Component() {
<div className="flex flex-col gap-2">
<div className="text-base font-medium">Dark</div>
<Progress progress={45} color="dark" />
<div className="text-base font-medium text-cyan-700">Blue</div>
<div className="text-base font-medium text-blue-700">Blue</div>
<Progress progress={45} color="blue" />
<div className="text-base font-medium text-red-700">Red</div>
<Progress progress={45} color="red" />
Expand All @@ -23,6 +23,16 @@ function Component() {
<Progress progress={45} color="indigo" />
<div className="text-base font-medium text-purple-700">Purple</div>
<Progress progress={45} color="purple" />
<div className="text-base font-medium text-cyan-700">Cyan</div>
<Progress progress={45} color="cyan" />
<div className="text-base font-medium text-gray-700">Gray</div>
<Progress progress={45} color="gray" />
<div className="text-base font-medium text-lime-700">Lime</div>
<Progress progress={45} color="lime" />
<div className="text-base font-medium text-pink-700">Pink</div>
<Progress progress={45} color="pink" />
<div className="text-base font-medium text-teal-700">Teal</div>
<Progress progress={45} color="teal" />
</div>
);
}
Expand All @@ -36,7 +46,7 @@ function Component() {
<div className="flex flex-col gap-2">
<div className="text-base font-medium">Dark</div>
<Progress progress={45} color="dark" />
<div className="text-base font-medium text-cyan-700">Blue</div>
<div className="text-base font-medium text-blue-700">Blue</div>
<Progress progress={45} color="blue" />
<div className="text-base font-medium text-red-700">Red</div>
<Progress progress={45} color="red" />
Expand All @@ -48,6 +58,16 @@ function Component() {
<Progress progress={45} color="indigo" />
<div className="text-base font-medium text-purple-700">Purple</div>
<Progress progress={45} color="purple" />
<div className="text-base font-medium text-cyan-700">Cyan</div>
<Progress progress={45} color="cyan" />
<div className="text-base font-medium text-gray-700">Gray</div>
<Progress progress={45} color="gray" />
<div className="text-base font-medium text-lime-700">Lime</div>
<Progress progress={45} color="lime" />
<div className="text-base font-medium text-pink-700">Pink</div>
<Progress progress={45} color="pink" />
<div className="text-base font-medium text-teal-700">Teal</div>
<Progress progress={45} color="teal" />
</div>
);
}
Expand All @@ -58,7 +78,7 @@ function Component() {
<div className="flex flex-col gap-2">
<div className="text-base font-medium">Dark</div>
<Progress progress={45} color="dark" />
<div className="text-base font-medium text-cyan-700">Blue</div>
<div className="text-base font-medium text-blue-700">Blue</div>
<Progress progress={45} color="blue" />
<div className="text-base font-medium text-red-700">Red</div>
<Progress progress={45} color="red" />
Expand All @@ -70,6 +90,16 @@ function Component() {
<Progress progress={45} color="indigo" />
<div className="text-base font-medium text-purple-700">Purple</div>
<Progress progress={45} color="purple" />
<div className="text-base font-medium text-cyan-700">Cyan</div>
<Progress progress={45} color="cyan" />
<div className="text-base font-medium text-gray-700">Gray</div>
<Progress progress={45} color="gray" />
<div className="text-base font-medium text-lime-700">Lime</div>
<Progress progress={45} color="lime" />
<div className="text-base font-medium text-pink-700">Pink</div>
<Progress progress={45} color="pink" />
<div className="text-base font-medium text-teal-700">Teal</div>
<Progress progress={45} color="teal" />
</div>
);
}
Expand Down
7 changes: 5 additions & 2 deletions src/components/Progress/Progress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ export interface FlowbiteProgressTheme {
}

export interface ProgressColor
extends Pick<FlowbiteColors, 'dark' | 'blue' | 'red' | 'green' | 'yellow' | 'indigo' | 'purple'> {
extends Pick<
FlowbiteColors,
'dark' | 'blue' | 'red' | 'green' | 'yellow' | 'indigo' | 'purple' | 'cyan' | 'gray' | 'lime' | 'pink' | 'teal'
> {
[key: string]: string;
}

Expand All @@ -36,7 +39,7 @@ export interface ProgressProps extends ComponentProps<'div'> {

export const Progress: FC<ProgressProps> = ({
className,
color = 'blue',
color = 'cyan',
labelProgress = false,
labelText = false,
progress,
Expand Down
7 changes: 6 additions & 1 deletion src/components/Progress/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@ export const progressTheme: FlowbiteProgressTheme = {
bar: 'rounded-full text-center font-medium leading-none text-cyan-300 dark:text-cyan-100 space-x-2',
color: {
dark: 'bg-gray-600 dark:bg-gray-300',
blue: 'bg-cyan-600',
blue: 'bg-blue-600',
red: 'bg-red-600 dark:bg-red-500',
green: 'bg-green-600 dark:bg-green-500',
yellow: 'bg-yellow-400',
indigo: 'bg-indigo-600 dark:bg-indigo-500',
purple: 'bg-purple-600 dark:bg-purple-500',
cyan: 'bg-cyan-600',
gray: 'bg-gray-500',
lime: 'bg-lime-600',
pink: 'bg-pink-500',
teal: 'bg-teal-600',
},
size: {
sm: 'h-1.5',
Expand Down