) => {
return (
) => {
@@ -20,6 +22,7 @@ export const Caption = ({
margin: 0,
fontWeight: 400,
lineHeight: 1,
+ color,
},
{
caption1: {
diff --git a/packages/react-component/src/components/Typography/components/Heading.tsx b/packages/react-component/src/components/Typography/components/Heading.tsx
index c78e96d1..6dd61972 100644
--- a/packages/react-component/src/components/Typography/components/Heading.tsx
+++ b/packages/react-component/src/components/Typography/components/Heading.tsx
@@ -7,11 +7,13 @@ export type HeadingType = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'
export interface HeadingProps {
type?: 'heading'
variant?: HeadingType
+ color?: string
className?: string
}
export const Heading = ({
variant = 'h1',
+ color,
children,
className,
}: PropsWithChildren) => {
@@ -22,6 +24,7 @@ export const Heading = ({
{
margin: 0,
lineHeight: 1,
+ color,
},
{
h1: { fontSize: '2.5rem', fontWeight: 700, letterSpacing: -0.6 },
diff --git a/packages/react-component/src/components/Typography/components/SubTitle.tsx b/packages/react-component/src/components/Typography/components/SubTitle.tsx
index cffedc07..2a81323c 100644
--- a/packages/react-component/src/components/Typography/components/SubTitle.tsx
+++ b/packages/react-component/src/components/Typography/components/SubTitle.tsx
@@ -5,11 +5,13 @@ export type SubTitleType = 'subTitle1' | 'subTitle2' | 'subTitle3'
export type SubTitleProps = {
type?: 'subTitle'
variant?: SubTitleType
+ color?: string
className?: string
}
export const SubTitle = ({
variant = 'subTitle1',
+ color,
children,
className,
}: PropsWithChildren) => {
@@ -19,6 +21,7 @@ export const SubTitle = ({
{
margin: 0,
lineHeight: 1,
+ color,
},
{
subTitle1: {
diff --git a/packages/react-component/src/components/index.ts b/packages/react-component/src/components/index.ts
index 5169c61b..9c456b7f 100644
--- a/packages/react-component/src/components/index.ts
+++ b/packages/react-component/src/components/index.ts
@@ -12,6 +12,7 @@ export * from './DateRangePicker'
export * from './Divider'
export * from './Drawer'
export * from './Dropdown'
+export * from './Flex'
export * from './Grid'
export * from './Header'
export * from './IconAdornment'
diff --git a/packages/react-component/src/theme/MusmaProvider/DefaultTheme.ts b/packages/react-component/src/theme/MusmaProvider/DefaultTheme.ts
index c5e0c78a..2c2324b1 100644
--- a/packages/react-component/src/theme/MusmaProvider/DefaultTheme.ts
+++ b/packages/react-component/src/theme/MusmaProvider/DefaultTheme.ts
@@ -23,13 +23,13 @@ const DefaultTheme: MusmaTheme = {
light: '#118EE5',
main: '#036DB7',
dark: '#025996',
- darker: '#01677D',
+ darker: '#003E6A',
},
blue: {
- lighter: '#1FA2FF',
- light: '#006CE8',
- main: '#084C9C',
- dark: '#013F6B',
+ lighter: '#F2F8FB',
+ light: '#118EE5',
+ main: '#036DB7',
+ dark: '#025996',
darker: '#003E6A',
},
black: {
@@ -54,25 +54,25 @@ const DefaultTheme: MusmaTheme = {
darker: '#EAEAEA',
},
red: {
- lighter: '#FF774E',
- light: '#FF440D',
- main: '#E82717',
- dark: '#9C1408',
- darker: '#7A252C',
+ lighter: '#EDDDDD',
+ light: '#FF4D4F',
+ main: '#CA3C3D',
+ dark: '#A63132',
+ darker: '#940E0F',
},
green: {
- lighter: '#69C7C6',
- light: '#1BB500',
- main: '#009C45',
- dark: '#00823B',
- darker: '#004F24',
+ lighter: '#E6E8D8',
+ light: '#00AA52',
+ main: '#A63132',
+ dark: '#066B36',
+ darker: '#054522',
},
orange: {
- lighter: '#FFBD4C',
- light: '#FA9F00',
- main: '#F5630C',
- dark: '#DB570B',
- darker: '#C24D0A',
+ lighter: '#FD9009',
+ light: '#FFAB43',
+ main: '#FD9009',
+ dark: '#E76F00',
+ darker: '#D86900',
},
transparent: 'transparent',
},