chore: fix workspace selector's singout button styles affected by removing override in Nancy

CHANGELOG.md

@@ -1,5 +1,39 @@
+## [1.33.1-chore-add-styles-from-nancy.7](https://github.com/mParticle/aquarium/compare/v1.33.1-chore-add-styles-from-nancy.6...v1.33.1-chore-add-styles-from-nancy.7) (2024-10-14)
+
+## [1.33.1-chore-add-styles-from-nancy.6](https://github.com/mParticle/aquarium/compare/v1.33.1-chore-add-styles-from-nancy.5...v1.33.1-chore-add-styles-from-nancy.6) (2024-10-14)
+
+### Bug Fixes
+
+- solve conflicts ([375110a](https://github.com/mParticle/aquarium/commit/375110a3d1ec12ae55e1e647a4c6edf01fe83942))
+
 ## [1.33.1-chore-fixing-peer-dependencies.1](https://github.com/mParticle/aquarium/compare/v1.33.0...v1.33.1-chore-fixing-peer-dependencies.1) (2024-10-04)
 
+## [1.33.1-chore-add-styles-from-nancy.5](https://github.com/mParticle/aquarium/compare/v1.33.1-chore-add-styles-from-nancy.4...v1.33.1-chore-add-styles-from-nancy.5) (2024-10-11)
+
+### Bug Fixes
+
+- update build plugin to include types and utils ([822be84](https://github.com/mParticle/aquarium/commit/822be8470928ee1dc3a0de8b5f50f7ce80d733c5))
+
+## [1.33.1-chore-add-styles-from-nancy.4](https://github.com/mParticle/aquarium/compare/v1.33.1-chore-add-styles-from-nancy.3...v1.33.1-chore-add-styles-from-nancy.4) (2024-10-11)
+
+### Bug Fixes
+
+- fix issue on prettifier ([#446](https://github.com/mParticle/aquarium/issues/446)) ([03668b6](https://github.com/mParticle/aquarium/commit/03668b6743aafd4a2ae40ceeec1411792427e392))
+- update icons that did not obey the color prop ([#445](https://github.com/mParticle/aquarium/issues/445)) ([68006e3](https://github.com/mParticle/aquarium/commit/68006e36843ec2e9e367d225bd6d2080bc2fcc19))
+
+## [1.33.1-chore-add-styles-from-nancy.3](https://github.com/mParticle/aquarium/compare/v1.33.1-chore-add-styles-from-nancy.2...v1.33.1-chore-add-styles-from-nancy.3) (2024-10-10)
+
+### Bug Fixes
+
+- worskpace selector button styles ([5c4f54d](https://github.com/mParticle/aquarium/commit/5c4f54da5fffaacb0f86ba7734624b94c3302a05))
+
+## [1.33.1-chore-add-styles-from-nancy.2](https://github.com/mParticle/aquarium/compare/v1.33.1-chore-add-styles-from-nancy.1...v1.33.1-chore-add-styles-from-nancy.2) (2024-10-09)
+
+### Bug Fixes
+
+- align button on global nav ([d40a067](https://github.com/mParticle/aquarium/commit/d40a06710e2821de760cbafab3d1602432be54ba))
+- trigger Build ([437f4e8](https://github.com/mParticle/aquarium/commit/437f4e84e5345ce4400d5b7dc02801ba7c4716a5))
+
 # [1.33.0](https://github.com/mParticle/aquarium/compare/v1.32.0...v1.33.0) (2024-09-30)
 
 ### Features

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mparticle/aquarium",
-  "version": "1.33.1-chore-fixing-peer-dependencies.1",
+  "version": "1.33.1-chore-add-styles-from-nancy.7",
   "description": "mParticle Component Library",
   "license": "Apache-2.0",
   "keywords": [

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: <Button type="primary">Switch to Legacy UI</Button> },
+      {
+        hrefOptions: { href: '/' },
+        type: 'button',
+        label: 'Switch to Legacy UI',
+      },
     ],
   },
 ]

src/components/navigation/GlobalNavigation/WorkspaceSelector/WorkspaceSelector.tsx

@@ -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}

src/components/navigation/GlobalNavigation/WorkspaceSelector/workspace-selector.css

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

src/components/navigation/GlobalNavigation/global-navigation.css

@@ -172,6 +172,7 @@
 }
 
 .globalNavigation__buttonItem {
+  width: 100%;
   padding: 0 !important;
   margin: 0 auto !important;
   color: var(--mp-brand-secondary-1) !important;
@@ -251,16 +252,12 @@
   margin-top: var(--margin-xxs);
 }
 
-.globalNavigation__iconLabel {
-  color: var(--color-text);
-  font-size: var(--label-size);
-}
-
 .globalNavigation__badge {
   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;
+  margin-left: 4px;
 }
 
 .globalNavigation__badge .ant-badge-count {
@@ -360,4 +357,47 @@
 .notificationCenter__header {
   padding: var(--padding-content-vertical-lg) var(--padding-content-horizontal-lg);
   border-bottom: 1px solid var(--color-border-secondary);
-}
+}
+
+/* styles from Nancy */
+
+.globalNavigation__iconLabel {
+  font-family: var(--font-family);
+  font-weight: 400;
+  color: var(--color-text);
+  font-size: var(--label-size);
+}
+
+.globalNavigation__searchIcon {
+  width: 22px !important;
+  height: 22px !important;
+  margin-left: -3px;
+}
+
+.globalNavigation__newExperienceReminder .ant-btn-link span {
+  color: var(--color-primary);
+  font-weight: 600;
+}
+
+.globalNavigation__newExperienceReminder .ant-btn-link span &:hover {
+  color: var(--color-primary-hover);
+}
+
+
+.ant-modal p,
+.ant-modal span {
+  font-family: var(--font-family);
+  font-weight: 400;
+}
+
+.ant-modal .ant-modal-title {
+  font-family: var(--font-family);
+  font-weight: 600;
+}
+
+.ant-form-item-label label {
+  margin-bottom: unset;
+  display: unset;
+  max-width: unset;
+  font-weight: unset;
+}

vite.config.js

@@ -14,8 +14,7 @@ export default defineConfig({
     },
   },
 
-  plugins: [svgr(), dts({ include: 'src/components', rollupTypes: true })],
-
+  plugins: [svgr(), dts({ include: 'src/', exclude: '**/*.stories.*', rollupTypes: false, insertTypesEntry: true })],
   build: {
     target: 'es6',
     outDir: 'dist',