From 0c1b3f356742b835a140fcd4e09b3ddf16ada0f2 Mon Sep 17 00:00:00 2001 From: Remko Huisman <43807324+remko48@users.noreply.github.com> Date: Fri, 10 Nov 2023 14:56:30 +0100 Subject: [PATCH] Revert "Revert "feature/NDT-18/commonground-theme"" --- README.md | 3 +++ package-lock.json | 4 ++-- package.json | 2 +- src/components/card/cardWrapper/CardWrapper.module.css | 2 ++ src/components/topNav/primaryTopNav/PrimaryTopNav.module.css | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 772a86f..dfc7aa8 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,9 @@ - **Version 2.2 (breaking changes from 2.1.x)** + - 2.2.25: + - Added box-shadow to CardWrapper. + - Added item border-radius to PrimaryTopNav. - 2.2.24: - Added DisplaySwitch component. - Removed align hover state on card-header. diff --git a/package-lock.json b/package-lock.json index 999f753..55fd9f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@conduction/components", - "version": "2.2.24", + "version": "2.2.25", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@conduction/components", - "version": "2.2.24", + "version": "2.2.25", "license": "ISC", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.2.0", diff --git a/package.json b/package.json index 896af21..9661fab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@conduction/components", - "version": "2.2.24", + "version": "2.2.25", "description": "React (Gatsby) components used within the Conduction Skeleton Application (and its implementations)", "main": "lib/index.js", "scripts": { diff --git a/src/components/card/cardWrapper/CardWrapper.module.css b/src/components/card/cardWrapper/CardWrapper.module.css index 370cdb4..17bd926 100644 --- a/src/components/card/cardWrapper/CardWrapper.module.css +++ b/src/components/card/cardWrapper/CardWrapper.module.css @@ -6,6 +6,7 @@ /* --conduction-card-wrapper-border-bottom-width: unset; */ /* --conduction-card-wrapper-border-bottom-style: unset; */ /* --conduction-card-wrapper-border-bottom-color: unset; */ + /* --conduction-card-wrapper-box-shadow: unset; */ /* --conduction-card-wrapper-hover-border-bottom-width: unset; */ /* --conduction-card-wrapper-hover-border-bottom-style: unset; */ /* --conduction-card-wrapper-hover-border-bottom-color: unset; */ @@ -34,6 +35,7 @@ var(--conduction-card-wrapper-border-bottom-style, var(--conduction-card-wrapper-border-style)) var(--conduction-card-wrapper-border-bottom-color, var(--conduction-card-wrapper-border-color)); position: relative; + box-shadow: var(--conduction-card-wrapper-box-shadow); } .container:hover { diff --git a/src/components/topNav/primaryTopNav/PrimaryTopNav.module.css b/src/components/topNav/primaryTopNav/PrimaryTopNav.module.css index 09b6dc5..ba76f22 100644 --- a/src/components/topNav/primaryTopNav/PrimaryTopNav.module.css +++ b/src/components/topNav/primaryTopNav/PrimaryTopNav.module.css @@ -6,8 +6,7 @@ --conduction-primary-top-nav-item-padding: var(--skeleton-size-md); --conduction-primary-top-nav-item-icon-margin: var(--skeleton-size-2x); - - /* --conduction-primary-top-nav- */ + /* --conduction-primary-top-nav-item-border-radius: var(--skeleton-size-2x); */ /* --conduction-primary-top-nav-current-background-color: #ffffff; */ /* --conduction-primary-top-nav-current-color: #4376fc; */ @@ -88,6 +87,7 @@ padding-inline-end: var(--conduction-primary-top-nav-item-padding); padding-block-start: var(--conduction-primary-top-nav-item-padding); padding-block-end: var(--conduction-primary-top-nav-item-padding); + border-radius: var(--conduction-primary-top-nav-item-border-radius); } .li:hover {