Skip to content

Commit

Permalink
Merge branch 'dev' into IN-945-service-edit-page
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Mar 13, 2024
2 parents 93b5586 + 7ae6be7 commit e41abf4
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 4 deletions.
2 changes: 1 addition & 1 deletion packages/ui/components/core/Badge/Community.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useSharedStyles } from './styles'

export const _Community = forwardRef<HTMLDivElement, BadgeCommunityProps>(
({ icon, hideTooltip, children, ...props }, ref) => {
const { classes } = useSharedStyles('leader')
const { classes } = useSharedStyles('community')
const { t } = useTranslation('common')
const variants = useCustomVariant()

Expand Down
22 changes: 22 additions & 0 deletions packages/ui/components/core/Badge/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,27 @@ export const useSharedStyles = (variant: SharedStyles) => {
},
}
}
case 'community': {
return {
root: {
backgroundColor: theme.other.colors.secondary.white,
borderColor: theme.other.colors.tertiary.coolGray,
},
inner: {
fontSize: theme.fontSizes.sm,
[theme.fn.largerThan('sm')]: {
fontSize: theme.fontSizes.md,
},
},
leftSection: {
fontSize: theme.fontSizes.sm,
marginRight: rem(6),
[theme.fn.largerThan('sm')]: {
fontSize: theme.fontSizes.md,
},
},
}
}
case 'privatePractice':
case 'claimed':
case 'unclaimed':
Expand Down Expand Up @@ -98,6 +119,7 @@ export const useSharedStyles = (variant: SharedStyles) => {
type SharedStyles =
| 'national'
| 'leader'
| 'community'
| 'privatePractice'
| 'claimed'
| 'unclaimed'
Expand Down
7 changes: 4 additions & 3 deletions packages/ui/theme/common.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -533,9 +533,10 @@ export const commonTheme = {
content: {
padding: '0px !important',
maxWidth: rem(600),
// [theme.fn.largerThan('sm')]: {
// minWidth: em(600),
// },
minWidth: '90vw',
[theme.fn.largerThan('sm')]: {
minWidth: em(600),
},
},
header: {
margin: 0,
Expand Down

0 comments on commit e41abf4

Please sign in to comment.