From 5a9ad676078dcafc6407e8ac10342b4a69d30873 Mon Sep 17 00:00:00 2001
From: Patrick Yeo <patrick.yeo@liferay.com>
Date: Fri, 29 Oct 2021 13:42:08 -0700
Subject: [PATCH] fix(@clayui/css): C Kbd and Cadmin C Kbd allow passing in
 properties to `.c-kbd-group > .c-kbd`, `.c-kbd-group-sm > .c-kbd`, and
 `.c-kbd-group-lg > .c-kbd` from their respective Sass map variables

fixes #4367
---
 .../clay-css/src/scss/cadmin/components/_type.scss     | 10 +++++++++-
 packages/clay-css/src/scss/cadmin/variables/_type.scss |  3 +++
 packages/clay-css/src/scss/components/_type.scss       | 10 +++++++++-
 packages/clay-css/src/scss/variables/_type.scss        |  3 +++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/clay-css/src/scss/cadmin/components/_type.scss b/packages/clay-css/src/scss/cadmin/components/_type.scss
index d45b7b1173..ce062fdb0b 100644
--- a/packages/clay-css/src/scss/cadmin/components/_type.scss
+++ b/packages/clay-css/src/scss/cadmin/components/_type.scss
@@ -203,7 +203,7 @@ strong {
 	@include clay-css($cadmin-c-kbd-group);
 
 	> .c-kbd {
-		font-size: inherit;
+		@include clay-css(setter(map-get($cadmin-c-kbd-group, c-kbd), ()));
 	}
 }
 
@@ -266,6 +266,10 @@ strong {
 
 .c-kbd-group-sm {
 	@include clay-css($cadmin-c-kbd-group-sm);
+
+	> .c-kbd {
+		@include clay-css(setter(map-get($cadmin-c-kbd-group-sm, c-kbd), ()));
+	}
 }
 
 .c-kbd-sm,
@@ -281,6 +285,10 @@ strong {
 
 .c-kbd-group-lg {
 	@include clay-css($cadmin-c-kbd-group-lg);
+
+	> .c-kbd {
+		@include clay-css(setter(map-get($cadmin-c-kbd-group-lg, c-kbd), ()));
+	}
 }
 
 .c-kbd-lg,
diff --git a/packages/clay-css/src/scss/cadmin/variables/_type.scss b/packages/clay-css/src/scss/cadmin/variables/_type.scss
index 79e49f23d3..cfb11295c6 100644
--- a/packages/clay-css/src/scss/cadmin/variables/_type.scss
+++ b/packages/clay-css/src/scss/cadmin/variables/_type.scss
@@ -13,6 +13,9 @@ $cadmin-c-kbd-group: () !default;
 $cadmin-c-kbd-group: map-deep-merge(
 	(
 		font-size: 14px,
+		c-kbd: (
+			font-size: inherit,
+		),
 	),
 	$cadmin-c-kbd-group
 );
diff --git a/packages/clay-css/src/scss/components/_type.scss b/packages/clay-css/src/scss/components/_type.scss
index 6f1ee70981..a959b78fed 100644
--- a/packages/clay-css/src/scss/components/_type.scss
+++ b/packages/clay-css/src/scss/components/_type.scss
@@ -202,7 +202,7 @@ strong {
 	@include clay-css($c-kbd-group);
 
 	> .c-kbd {
-		font-size: inherit;
+		@include clay-css(setter(map-get($c-kbd-group, c-kbd), ()));
 	}
 }
 
@@ -265,6 +265,10 @@ strong {
 
 .c-kbd-group-sm {
 	@include clay-css($c-kbd-group-sm);
+
+	> .c-kbd {
+		@include clay-css(setter(map-get($c-kbd-group-sm, c-kbd), ()));
+	}
 }
 
 .c-kbd-sm,
@@ -280,6 +284,10 @@ strong {
 
 .c-kbd-group-lg {
 	@include clay-css($c-kbd-group-lg);
+
+	> .c-kbd {
+		@include clay-css(setter(map-get($c-kbd-group-lg, c-kbd), ()));
+	}
 }
 
 .c-kbd-lg,
diff --git a/packages/clay-css/src/scss/variables/_type.scss b/packages/clay-css/src/scss/variables/_type.scss
index ca67566442..0205bd80fe 100644
--- a/packages/clay-css/src/scss/variables/_type.scss
+++ b/packages/clay-css/src/scss/variables/_type.scss
@@ -13,6 +13,9 @@ $c-kbd-group: () !default;
 $c-kbd-group: map-deep-merge(
 	(
 		font-size: 0.875rem,
+		c-kbd: (
+			font-size: inherit,
+		),
 	),
 	$c-kbd-group
 );