Skip to content

Commit

Permalink
chore: cleanup styles from Nancy (#469)
Browse files Browse the repository at this point in the history
Co-authored-by: mparticle-automation <developers@mparticle.com>
  • Loading branch information
gabyzif and mparticle-automation authored Oct 28, 2024
1 parent 55fcd6f commit e97a8d7
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 9 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## [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
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mparticle/aquarium",
"version": "1.33.2",
"version": "1.33.3-chore-remove-workspace-button-override.1",
"description": "mParticle Component Library",
"license": "Apache-2.0",
"keywords": [
Expand Down
1 change: 1 addition & 0 deletions src/components/data-entry/Form/Form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<Values = any> extends AntFormProps<Values> {
children: ReactNode
Expand Down
4 changes: 4 additions & 0 deletions src/components/data-entry/Form/form.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.ant-form-item-label label {
margin-bottom: unset;
font-weight: unset;
}
2 changes: 1 addition & 1 deletion src/components/feedback/Modal/Modal.tsx
Original file line number Diff line number Diff line change
@@ -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) => {
Expand Down
3 changes: 3 additions & 0 deletions src/components/feedback/Modal/modal.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.ant-modal .ant-modal-title {
font-weight: var(--font-weight-strong)
}
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,11 @@ const mpManagement: IGlobalNavigationItem[] = [
children: [
{ hrefOptions: { href: '/' }, label: 'Platform Settings' },
{ hrefOptions: { href: '/' }, label: 'User Settings' },
{ hrefOptions: { href: '/' }, label: <Button type="primary">Switch to Legacy UI</Button> },
{
hrefOptions: { href: '/' },
type: 'button',
label: 'Switch to Legacy UI',
},
],
},
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export function WorkspaceSelector(props: IWorkspaceSelectorProps) {
<Popover
arrow={false}
placement="right"
overlayInnerStyle={{ padding: PaddingXxs }}
overlayInnerStyle={{ padding: PaddingXxs, width: '100%' }}
overlayClassName="workspaceSelector__popover"
onOpenChange={focusOnInput}
afterOpenChange={focusOnInput}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
}

.workspaceSelector__signoutButtonContainer {
width: calc(100% - var(--padding-xs));
width: 100%;
position: absolute;
bottom: 0;
left: 0;
Expand All @@ -131,4 +131,4 @@

.workspaceSelector__signoutButton {
width: 100%;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,10 @@
}

.globalNavigation__badge {
margin-left: 4px;
border: solid 1px var(--color-border);
border-radius: var(--border-radius-sm);
padding: 1px var(--padding-content-vertical-sm);
padding: 0;
box-shadow: none !important;
}

Expand Down
8 changes: 8 additions & 0 deletions src/hooks/NewExperienceReminder/new-experience-reminder.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
.globalNavigation__newExperienceReminder.globalNavigation__newExperienceReminder-bottomLeft {
left: calc(var(--nav-width) + var(--margin-xs)) !important;
}

.globalNavigation__newExperienceReminder .ant-btn-link span {
color: var(--color-primary);
}

.globalNavigation__newExperienceReminder .ant-btn-link span:hover {
color: var(--color-primary-hover);
}

0 comments on commit e97a8d7

Please sign in to comment.