diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b122d34c..8f0a24acf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -154,6 +154,20 @@ ## [1.33.3-fix-semantic-release.1](https://github.com/mParticle/aquarium/compare/v1.33.2...v1.33.3-fix-semantic-release.1) (2024-10-25) +## [1.33.3-chore-remove-workspace-button-override.1](https://github.com/mParticle/aquarium/compare/v1.33.2...v1.33.3-chore-remove-workspace-button-override.1) (2024-10-28) + +### Bug Fixes + +- (styles) update global nav icon label text styles ([047c42b](https://github.com/mParticle/aquarium/commit/047c42b48b780f3ce554519e04a4b259b2406a8d)) +- align button on global nav ([d40a067](https://github.com/mParticle/aquarium/commit/d40a06710e2821de760cbafab3d1602432be54ba)) +- global nav styles cleanup ([d6d64fc](https://github.com/mParticle/aquarium/commit/d6d64fc3243d39d476c71c6a2820aa6c8dd11220)) +- solve conflicts ([375110a](https://github.com/mParticle/aquarium/commit/375110a3d1ec12ae55e1e647a4c6edf01fe83942)) +- trigger Build ([437f4e8](https://github.com/mParticle/aquarium/commit/437f4e84e5345ce4400d5b7dc02801ba7c4716a5)) +- update build plugin to include types and utils ([822be84](https://github.com/mParticle/aquarium/commit/822be8470928ee1dc3a0de8b5f50f7ce80d733c5)) +- update modal font weight ([882fa80](https://github.com/mParticle/aquarium/commit/882fa80db426cd76c3e9b771faa8336cfea36ad6)) +- update package json to try fixing release error ([e6c13c4](https://github.com/mParticle/aquarium/commit/e6c13c46d6381d6d061b6fbd0544c7b42bd2b1d4)) +- worskpace selector button styles ([5c4f54d](https://github.com/mParticle/aquarium/commit/5c4f54da5fffaacb0f86ba7734624b94c3302a05)) + ## [1.33.2](https://github.com/mParticle/aquarium/compare/v1.33.1...v1.33.2) (2024-10-18) ### Bug Fixes diff --git a/src/components/data-entry/Form/Form.tsx b/src/components/data-entry/Form/Form.tsx index dc9fdaf35..5a825bab8 100644 --- a/src/components/data-entry/Form/Form.tsx +++ b/src/components/data-entry/Form/Form.tsx @@ -2,6 +2,7 @@ import { Form as AntForm } from 'antd' import { type FormProps as AntFormProps } from 'antd' import { ConfigProvider } from 'src/components' import { type ReactNode } from 'react' +import './form.css' export type { FormInstance } from 'antd' export interface IFormProps extends AntFormProps { children: ReactNode diff --git a/src/components/data-entry/Form/form.css b/src/components/data-entry/Form/form.css new file mode 100644 index 000000000..0452b34fb --- /dev/null +++ b/src/components/data-entry/Form/form.css @@ -0,0 +1,4 @@ +.ant-form-item-label label { + margin-bottom: unset; + font-weight: unset; +} \ No newline at end of file diff --git a/src/components/feedback/Modal/Modal.tsx b/src/components/feedback/Modal/Modal.tsx index b51fc36b0..1b341c9f0 100644 --- a/src/components/feedback/Modal/Modal.tsx +++ b/src/components/feedback/Modal/Modal.tsx @@ -1,7 +1,7 @@ import { Modal as AntModal } from 'antd' import { type ModalProps as AntModalProps } from 'antd' import { ConfigProvider } from 'src/components' - +import './modal.css' export interface IModalProps extends AntModalProps {} export const Modal = (props: IModalProps) => { diff --git a/src/components/feedback/Modal/modal.css b/src/components/feedback/Modal/modal.css new file mode 100644 index 000000000..9c79d959c --- /dev/null +++ b/src/components/feedback/Modal/modal.css @@ -0,0 +1,3 @@ +.ant-modal .ant-modal-title { + font-weight: var(--font-weight-strong) +} \ No newline at end of file diff --git a/src/components/navigation/GlobalNavigation/GlobalNavigation.stories.tsx b/src/components/navigation/GlobalNavigation/GlobalNavigation.stories.tsx index ea5f6ed72..332f84c67 100644 --- a/src/components/navigation/GlobalNavigation/GlobalNavigation.stories.tsx +++ b/src/components/navigation/GlobalNavigation/GlobalNavigation.stories.tsx @@ -308,7 +308,11 @@ const mpManagement: IGlobalNavigationItem[] = [ children: [ { hrefOptions: { href: '/' }, label: 'Platform Settings' }, { hrefOptions: { href: '/' }, label: 'User Settings' }, - { hrefOptions: { href: '/' }, label: }, + { + hrefOptions: { href: '/' }, + type: 'button', + label: 'Switch to Legacy UI', + }, ], }, ] diff --git a/src/components/navigation/GlobalNavigation/WorkspaceSelector/WorkspaceSelector.tsx b/src/components/navigation/GlobalNavigation/WorkspaceSelector/WorkspaceSelector.tsx index d05ac89bc..a377fdd66 100644 --- a/src/components/navigation/GlobalNavigation/WorkspaceSelector/WorkspaceSelector.tsx +++ b/src/components/navigation/GlobalNavigation/WorkspaceSelector/WorkspaceSelector.tsx @@ -139,7 +139,7 @@ export function WorkspaceSelector(props: IWorkspaceSelectorProps) {