Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into big-nate/bus-939-create-new-structure-for-chats

This commit is contained in:
Nate Kelley 2025-01-30 17:16:39 -07:00
parent 337569fd9c 5b231e1efd
commit 731969aa49
No known key found for this signature in database
GPG Key ID: FD90372AB8D98B4F
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/src/app/app/dashboards/[dashboardId]/_DashboardMetricItem/MetricTitle.tsx
View File

@ -48,17 +48,21 @@ export const MetricTitle: React.FC<{
<div <div
{...attributes} {...attributes}
{...listeners} {...listeners}
className={cx('group flex h-full cursor-pointer flex-col space-y-0.5 px-4 py-2')}> className={cx('group flex cursor-pointer flex-col space-y-0.5 px-4')}>
<div className="flex w-full justify-between space-x-0.5"> <div className="flex w-full justify-between space-x-0.5">
<Title {...titleConfig} level={4}> <Title
{`${title}`} {...titleConfig}
level={4}
className="max-w-[calc(100%_-_24px)] !text-md"
style={{ fontSize: '14px' }}>
{`${title} ${title} ${title} ${title} ${title} ${title} `}
</Title> </Title>
{isDragOverlay || !allowEdit ? ( {isDragOverlay || !allowEdit ? (
<ThreeDotPlaceholder /> <></>
) : ( ) : (
<ThreeDotMenu <ThreeDotMenu
className="opacity-0 transition group-hover:opacity-100" className="absolute right-[12px] top-[5px] opacity-0 transition group-hover:opacity-100"
dashboardId={dashboardId} dashboardId={dashboardId}
threadId={threadId} threadId={threadId}
/> />
@ -144,13 +148,9 @@ const ThreeDotMenu: React.FC<{
}); });
return ( return (
<div onClick={onClick} className={`relative w-[24px] ${className}`}> <div onClick={onClick} className={`w-[24px] ${className}`}>
<Dropdown trigger={['click']} menu={dropdownMenu}> <Dropdown trigger={['click']} menu={dropdownMenu}>
<Button <Button className="" type="text" icon={<AppMaterialIcons icon="more_vert" />} />
className="absolute top-[-2px]"
type="text"
icon={<AppMaterialIcons icon="more_vert" />}
/>
</Dropdown> </Dropdown>
</div> </div>
); );

2
web/src/app/app/dashboards/[dashboardId]/_DashboardMetricItem/_DashboardMetricItem.tsx
View File

@ -58,7 +58,7 @@ const _DashboardMetricItem: React.FC<{
const cardClassNamesMemoized = useMemo(() => { const cardClassNamesMemoized = useMemo(() => {
return { return {
body: `h-full w-full overflow-hidden !p-0 relative`, body: `h-full w-full overflow-hidden !p-0 relative`,
header: cx(`!p-0 !min-h-[65px]`, styles.cardTitle) header: cx(`!p-0 !min-h-[52px]`, styles.cardTitle)
}; };
}, []); }, []);

1
web/src/components/text/Title.tsx
View File

@ -27,6 +27,7 @@ export const Title = React.memo<
}} }}
{...props} {...props}
className={cx( className={cx(
'leading-none',
type === 'default' && styles.default, type === 'default' && styles.default,
type === 'secondary' && styles.secondary, type === 'secondary' && styles.secondary,
type === 'tertiary' && styles.tertiary, type === 'tertiary' && styles.tertiary,

5
web/src/styles/busterAntDStyleConfig.tsx
View File

@ -249,7 +249,10 @@ export const busterAppStyleConfig: ThemeConfig = {
colorBgContainer: '#FFF', colorBgContainer: '#FFF',
colorBorderSecondary: '#E0E0E0', colorBorderSecondary: '#E0E0E0',
lineWidth: 0.5, lineWidth: 0.5,
fontWeightStrong: 400 fontWeightStrong: 400,
borderRadiusLG: 6,
borderRadiusSM: 6,
borderRadiusXS: 6
}, },
Slider: { Slider: {
trackBg: '#E0E0E0' trackBg: '#E0E0E0'