From 78bc479a5bb292cc525190ad6b5ef842e846d58a Mon Sep 17 00:00:00 2001 From: Anastasiia Stavitskaya Date: Tue, 3 Sep 2024 12:45:34 -0700 Subject: [PATCH 1/5] fix: unnest css --- .../navigation/GlobalNavigation/global-navigation.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/navigation/GlobalNavigation/global-navigation.css b/src/components/navigation/GlobalNavigation/global-navigation.css index 5e0ef97de..ab7065a48 100644 --- a/src/components/navigation/GlobalNavigation/global-navigation.css +++ b/src/components/navigation/GlobalNavigation/global-navigation.css @@ -302,10 +302,8 @@ border-radius: 100%; } -.globalNavigation__suiteLogo:hover .globalNavigation__icon--suiteBackground { - svg { - fill: var(--mp-brand-primary-7); - } +.globalNavigation__suiteLogo:hover .globalNavigation__icon--suiteBackground svg { + fill: var(--mp-brand-primary-7); } .globalNavigation__icon.globalNavigation__icon--suiteLogo svg { From a08e4ce23f0b24dbea5b0add4c6e5caf86c2ed53 Mon Sep 17 00:00:00 2001 From: mparticle-automation Date: Tue, 3 Sep 2024 19:58:32 +0000 Subject: [PATCH 2/5] chore(release): 1.30.1-fix-css-in-nancy.1 [skip ci] ## [1.30.1-fix-css-in-nancy.1](https://github.com/mParticle/aquarium/compare/v1.30.0...v1.30.1-fix-css-in-nancy.1) (2024-09-03) ### Bug Fixes * unnest css ([78bc479](https://github.com/mParticle/aquarium/commit/78bc479a5bb292cc525190ad6b5ef842e846d58a)) --- CHANGELOG.md | 6 ++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6392fe53..9b944b091 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [1.30.1-fix-css-in-nancy.1](https://github.com/mParticle/aquarium/compare/v1.30.0...v1.30.1-fix-css-in-nancy.1) (2024-09-03) + +### Bug Fixes + +- unnest css ([78bc479](https://github.com/mParticle/aquarium/commit/78bc479a5bb292cc525190ad6b5ef842e846d58a)) + # [1.30.0](https://github.com/mParticle/aquarium/compare/v1.29.0...v1.30.0) (2024-09-03) ### Features diff --git a/package-lock.json b/package-lock.json index cfd1808a4..d40b2cb82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@mparticle/aquarium", - "version": "1.30.0", + "version": "1.30.1-fix-css-in-nancy.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@mparticle/aquarium", - "version": "1.30.0", + "version": "1.30.1-fix-css-in-nancy.1", "license": "Apache-2.0", "dependencies": { "lodash.clonedeep": "4.5.0" diff --git a/package.json b/package.json index b7cb95345..f7bc79903 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mparticle/aquarium", - "version": "1.30.0", + "version": "1.30.1-fix-css-in-nancy.1", "description": "mParticle Component Library", "license": "Apache-2.0", "keywords": [ From 3eb695bf73aca2a2e84f3601e0a6e96422750382 Mon Sep 17 00:00:00 2001 From: Anastasiia Stavitskaya Date: Tue, 3 Sep 2024 14:27:27 -0700 Subject: [PATCH 3/5] fix: home logo svg unnested --- .../navigation/GlobalNavigation/global-navigation.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/navigation/GlobalNavigation/global-navigation.css b/src/components/navigation/GlobalNavigation/global-navigation.css index ab7065a48..6b73745ac 100644 --- a/src/components/navigation/GlobalNavigation/global-navigation.css +++ b/src/components/navigation/GlobalNavigation/global-navigation.css @@ -325,9 +325,9 @@ background-color: black; color: white; cursor: pointer; +} - svg { - width: 28px; - height: var(--size-lg); - } +.globalNavigation__mpHome svg { + width: 28px; + height: var(--size-lg); } From 911263f092394b4132adc0e4833886a2de1186f2 Mon Sep 17 00:00:00 2001 From: Anastasiia Stavitskaya Date: Tue, 3 Sep 2024 17:09:57 -0700 Subject: [PATCH 4/5] chore: move css var to global-nav --- .../GlobalNavigation/SuiteSelector/suite-selector.css | 4 ---- .../navigation/GlobalNavigation/global-navigation.css | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components/navigation/GlobalNavigation/SuiteSelector/suite-selector.css b/src/components/navigation/GlobalNavigation/SuiteSelector/suite-selector.css index f704bd966..8c4cb10e6 100644 --- a/src/components/navigation/GlobalNavigation/SuiteSelector/suite-selector.css +++ b/src/components/navigation/GlobalNavigation/SuiteSelector/suite-selector.css @@ -1,7 +1,3 @@ -:root { - --suite-selector-content-max-width: 272px; -} - .suiteSelector__content { max-width: var(--suite-selector-content-max-width); margin-bottom: var(--margin-xs); diff --git a/src/components/navigation/GlobalNavigation/global-navigation.css b/src/components/navigation/GlobalNavigation/global-navigation.css index 6b73745ac..fb432c88a 100644 --- a/src/components/navigation/GlobalNavigation/global-navigation.css +++ b/src/components/navigation/GlobalNavigation/global-navigation.css @@ -6,7 +6,8 @@ --color-scrollbar-handle: rgb(0 0 0 / 15%); --color-scrollbar-track: transparent; --size-scrollbar-handle: 6px; - --label-size: 10px + --label-size: 10px; + --suite-selector-content-max-width: 272px; } .globalNavigation { From 0b37513fb01143bb1b41954cdac65510f70487f5 Mon Sep 17 00:00:00 2001 From: mparticle-automation Date: Wed, 4 Sep 2024 00:15:54 +0000 Subject: [PATCH 5/5] chore(release): 1.30.1-fix-css-in-nancy.2 [skip ci] ## [1.30.1-fix-css-in-nancy.2](https://github.com/mParticle/aquarium/compare/v1.30.1-fix-css-in-nancy.1...v1.30.1-fix-css-in-nancy.2) (2024-09-04) ### Bug Fixes * home logo svg unnested ([3eb695b](https://github.com/mParticle/aquarium/commit/3eb695bf73aca2a2e84f3601e0a6e96422750382)) --- CHANGELOG.md | 6 ++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b944b091..1ad3ab685 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [1.30.1-fix-css-in-nancy.2](https://github.com/mParticle/aquarium/compare/v1.30.1-fix-css-in-nancy.1...v1.30.1-fix-css-in-nancy.2) (2024-09-04) + +### Bug Fixes + +- home logo svg unnested ([3eb695b](https://github.com/mParticle/aquarium/commit/3eb695bf73aca2a2e84f3601e0a6e96422750382)) + ## [1.30.1-fix-css-in-nancy.1](https://github.com/mParticle/aquarium/compare/v1.30.0...v1.30.1-fix-css-in-nancy.1) (2024-09-03) ### Bug Fixes diff --git a/package-lock.json b/package-lock.json index d40b2cb82..9ca8c371f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@mparticle/aquarium", - "version": "1.30.1-fix-css-in-nancy.1", + "version": "1.30.1-fix-css-in-nancy.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@mparticle/aquarium", - "version": "1.30.1-fix-css-in-nancy.1", + "version": "1.30.1-fix-css-in-nancy.2", "license": "Apache-2.0", "dependencies": { "lodash.clonedeep": "4.5.0" diff --git a/package.json b/package.json index f7bc79903..09a4e09b9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mparticle/aquarium", - "version": "1.30.1-fix-css-in-nancy.1", + "version": "1.30.1-fix-css-in-nancy.2", "description": "mParticle Component Library", "license": "Apache-2.0", "keywords": [