diff --git a/src/shared/util/themeColors.ts b/src/shared/util/themeColors.ts
index 3e939c57..f52cba4c 100644
--- a/src/shared/util/themeColors.ts
+++ b/src/shared/util/themeColors.ts
@@ -1,15 +1,15 @@
export const colors = {
ut: {
- 'burnt-orange': '#BF5700',
+ burntorange: '#BF5700',
black: '#333F48',
orange: '#f8971f',
yellow: '#ffd600',
- 'light-green': '#a6cd57',
+ lightgreen: '#a6cd57',
green: '#579d42',
teal: '#00a9b7',
blue: '#005f86',
gray: '#9cadb7',
- 'off-white': '#d6d2c4',
+ offwhite: '#d6d2c4',
concrete: '#95a5a6',
},
theme: {
diff --git a/src/stories/components/Button.stories.tsx b/src/stories/components/Button.stories.tsx
index f6de21a2..e62093ac 100644
--- a/src/stories/components/Button.stories.tsx
+++ b/src/stories/components/Button.stories.tsx
@@ -1,14 +1,14 @@
-import { Button } from 'src/views/components/common/Button/Button';
import type { Meta, StoryObj } from '@storybook/react';
import React from 'react';
import { colorsFlattened } from 'src/shared/util/themeColors';
-import ImagePlaceholderIcon from '~icons/material-symbols/image';
+import { Button } from 'src/views/components/common/Button/Button';
import AddIcon from '~icons/material-symbols/add';
-import RemoveIcon from '~icons/material-symbols/remove';
import CalendarMonthIcon from '~icons/material-symbols/calendar-month';
-import ReviewsIcon from '~icons/material-symbols/reviews';
-import HappyFaceIcon from '~icons/material-symbols/mood';
import DescriptionIcon from '~icons/material-symbols/description';
+import ImagePlaceholderIcon from '~icons/material-symbols/image';
+import HappyFaceIcon from '~icons/material-symbols/mood';
+import RemoveIcon from '~icons/material-symbols/remove';
+import ReviewsIcon from '~icons/material-symbols/reviews';
// More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export
const meta = {
@@ -128,7 +128,7 @@ export const CourseCatalogActionButtons: Story = {
},
render: props => (
-
+
diff --git a/src/views/components/common/Button/Button.tsx b/src/views/components/common/Button/Button.tsx
index d2be0bd3..689281a2 100644
--- a/src/views/components/common/Button/Button.tsx
+++ b/src/views/components/common/Button/Button.tsx
@@ -1,7 +1,7 @@
import clsx from 'clsx';
import React from 'react';
-import { ThemeColor, getThemeColorHexByName, getThemeColorRgbByName } from '../../../../shared/util/themeColors';
import type IconComponent from '~icons/material-symbols';
+import { ThemeColor, getThemeColorHexByName, getThemeColorRgbByName } from '../../../../shared/util/themeColors';
import Text from '../Text/Text';
interface Props {
@@ -33,28 +33,24 @@ export function Button({
const Icon = icon;
const isIconOnly = !children && !!icon;
const colorHex = getThemeColorHexByName(color);
- const colorRgb = getThemeColorRgbByName(color).join(' ');
+ const colorRgb = getThemeColorRgbByName(color)?.join(' ');
return (