Commit 7d046cb2 authored by tom's avatar tom

tabs and radiuses

parent 294942e4
...@@ -63,6 +63,7 @@ const variants = { ...@@ -63,6 +63,7 @@ const variants = {
const Button: ComponentStyleConfig = { const Button: ComponentStyleConfig = {
baseStyle: { baseStyle: {
fontWeight: 'normal', fontWeight: 'normal',
borderRadius: 'base',
}, },
variants, variants,
sizes: { sizes: {
......
...@@ -45,8 +45,8 @@ const Table: ComponentMultiStyleConfig = { ...@@ -45,8 +45,8 @@ const Table: ComponentMultiStyleConfig = {
}, },
table: { table: {
tableLayout: 'fixed', tableLayout: 'fixed',
borderTopLeftRadius: 'md', borderTopLeftRadius: 'base',
borderTopRightRadius: 'md', borderTopRightRadius: 'base',
overflow: 'hidden', overflow: 'hidden',
fontVariant: 'normal', fontVariant: 'normal',
}, },
......
...@@ -3,21 +3,23 @@ import type { ComponentStyleConfig } from '@chakra-ui/theme'; ...@@ -3,21 +3,23 @@ import type { ComponentStyleConfig } from '@chakra-ui/theme';
import type { import type {
PartsStyleFunction, PartsStyleFunction,
} from '@chakra-ui/theme-tools'; } from '@chakra-ui/theme-tools';
import { getColor } from '@chakra-ui/theme-tools'; import { mode } from '@chakra-ui/theme-tools';
const variantSoftRounded: PartsStyleFunction<typeof parts> = (props) => { const variantSoftRounded: PartsStyleFunction<typeof parts> = (props) => {
const { colorScheme: c, theme } = props;
return { return {
tab: { tab: {
borderRadius: '12px', borderRadius: 'base',
fontWeight: 'semibold', fontWeight: '600',
color: 'gray.600', color: mode('blue.700', 'gray.400')(props),
_selected: { _selected: {
color: getColor(theme, `${ c }.700`), color: mode('blue.700', 'gray.50')(props),
bg: getColor(theme, `${ c }.50`), bg: mode('blue.50', 'gray.800')(props),
_hover: {
color: mode('blue.700', 'gray.50')(props),
},
}, },
_hover: { _hover: {
color: getColor(theme, `${ c }.400`), color: 'blue.400',
}, },
}, },
}; };
......
...@@ -10,7 +10,7 @@ const variantGray: PartsStyleFunction<typeof parts> = (props) => { ...@@ -10,7 +10,7 @@ const variantGray: PartsStyleFunction<typeof parts> = (props) => {
return { return {
container: { container: {
bg: mode('gray.200', 'gray.600')(props), bg: mode('blackAlpha.100', 'whiteAlpha.400')(props),
color: mode('gray.600', 'gray.50')(props), color: mode('gray.600', 'gray.50')(props),
...transitionProps, ...transitionProps,
}, },
...@@ -27,7 +27,7 @@ const Tag: ComponentStyleConfig = { ...@@ -27,7 +27,7 @@ const Tag: ComponentStyleConfig = {
display: 'inline-block', display: 'inline-block',
overflow: 'hidden', overflow: 'hidden',
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
borderRadius: 'md', borderRadius: 'sm',
}, },
}, },
variants, variants,
......
...@@ -2,8 +2,8 @@ const borders = { ...@@ -2,8 +2,8 @@ const borders = {
radii: { radii: {
none: '0', none: '0',
sm: '4px', sm: '4px',
md: '8px', base: '8px',
base: '12px', md: '12px',
lg: '24px', lg: '24px',
full: '9999px', full: '9999px',
}, },
......
...@@ -28,7 +28,7 @@ const AccountNavLink = ({ text, pathname, icon }: Props) => { ...@@ -28,7 +28,7 @@ const AccountNavLink = ({ text, pathname, icon }: Props) => {
color={ isActive ? colors.text.active : colors.text.default } color={ isActive ? colors.text.active : colors.text.default }
bgColor={ isActive ? colors.bg.active : colors.bg.default } bgColor={ isActive ? colors.bg.active : colors.bg.default }
_hover={{ color: isActive ? colors.text.active : colors.text.hover }} _hover={{ color: isActive ? colors.text.active : colors.text.hover }}
borderRadius="md" borderRadius="base"
> >
<HStack spacing={ 3 }> <HStack spacing={ 3 }>
<Icon as={ icon } boxSize="30px"/> <Icon as={ icon } boxSize="30px"/>
......
...@@ -28,7 +28,7 @@ const MainNavLink = ({ text, pathname, icon }: Props) => { ...@@ -28,7 +28,7 @@ const MainNavLink = ({ text, pathname, icon }: Props) => {
color={ isActive ? colors.text.active : colors.text.default } color={ isActive ? colors.text.active : colors.text.default }
bgColor={ isActive ? colors.bg.active : colors.bg.default } bgColor={ isActive ? colors.bg.active : colors.bg.default }
_hover={{ color: isActive ? colors.text.active : colors.text.hover }} _hover={{ color: isActive ? colors.text.active : colors.text.hover }}
borderRadius="md" borderRadius="base"
> >
<HStack spacing={ 3 }> <HStack spacing={ 3 }>
<Icon as={ icon } boxSize="30px"/> <Icon as={ icon } boxSize="30px"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment