From 2132e6aa5ed35e1131c7e2aeaccab71842cbee2d Mon Sep 17 00:00:00 2001 From: Tero Tikkanen Date: Tue, 19 Nov 2024 10:27:14 +0200 Subject: [PATCH] Fix/nav dropdown color (#431) * Use site nav bgcolor on dropdowns too * Up themes --- components/common/GlobalNav.tsx | 2 +- package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/common/GlobalNav.tsx b/components/common/GlobalNav.tsx index 64af7eb1..8d05483e 100644 --- a/components/common/GlobalNav.tsx +++ b/components/common/GlobalNav.tsx @@ -303,6 +303,7 @@ const StyledDropdown = styled(UncontrolledDropdown)` } .dropdown-menu { + background-color: ${(props) => props.theme.siteNavBackground}; border: 0px; padding-top: ${(props) => props.theme.spaces.s150}; box-shadow: none; @@ -328,7 +329,6 @@ const StyledDropdown = styled(UncontrolledDropdown)` @media (min-width: ${(props) => props.theme.breakpointMd}) { .dropdown-menu { - background-color: ${(props) => props.theme.themeColors.white}; box-shadow: 3px 3px 6px 2px ${(props) => transparentize(0.85, props.theme.themeColors.black)}}; } diff --git a/package.json b/package.json index 2823e98b..6a1fdd1c 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ }, "packageManager": "yarn@3.2.1", "optionalDependencies": { - "@kausal/themes-private": "^0.5.21" + "@kausal/themes-private": "^0.5.22" }, "lint-staged": { "*.{tsx,ts,js,css,scss,md,json}": "prettier --write" diff --git a/yarn.lock b/yarn.lock index 4fbb8875..c3aa5650 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3618,10 +3618,10 @@ __metadata: languageName: node linkType: hard -"@kausal/themes-private@npm:^0.5.21": - version: 0.5.21 - resolution: "@kausal/themes-private@npm:0.5.21" - checksum: 6cce55c695ac07c54c4d87502aa569a331de6eda02d82eff912dc478129dcfd2d889355372c3106feaa8dfcf38f39e34a47965c19ef8608a62289e256f6e4be5 +"@kausal/themes-private@npm:^0.5.22": + version: 0.5.22 + resolution: "@kausal/themes-private@npm:0.5.22" + checksum: de350404203ff1ba09900b4d248b8990ab3b3ebc592c1fbe672e738686da85438da2dffc055c3528993fe8a743fafbecac8cb0556fce56e9bef60b362ea28030 languageName: node linkType: hard @@ -16848,7 +16848,7 @@ __metadata: "@kausal/mapboxgl-legend": ^1.7.2 "@kausal/plotly-custom": ^2.32.0 "@kausal/themes": ^0.8.2 - "@kausal/themes-private": ^0.5.21 + "@kausal/themes-private": ^0.5.22 "@n8tb1t/use-scroll-position": ^2.0.3 "@next/bundle-analyzer": ^12.1.6 "@playwright/test": ^1.39.0