Merge branch 'main' into feat-new-popover

db-ui · Mar 28, 2024 · d1d7547 · d1d7547
2 parents 1c8fe2f + 76b936e
commit d1d7547
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 35 deletions.
diff --git a/__snapshots__/badge/component/chromium/DBBadge-should-match-screenshot.png b/__snapshots__/badge/component/chromium/DBBadge-should-match-screenshot.png
diff --git a/__snapshots__/badge/component/firefox/DBBadge-should-match-screenshot.png b/__snapshots__/badge/component/firefox/DBBadge-should-match-screenshot.png
diff --git a/__snapshots__/badge/component/mobile-chrome/DBBadge-should-match-screenshot.png b/__snapshots__/badge/component/mobile-chrome/DBBadge-should-match-screenshot.png
diff --git a/...s__/badge/showcase/chromium/regular/neutral/DBBadge-should-match-screenshot.png b/...s__/badge/showcase/chromium/regular/neutral/DBBadge-should-match-screenshot.png
diff --git a/...ts__/badge/showcase/firefox/regular/neutral/DBBadge-should-match-screenshot.png b/...ts__/badge/showcase/firefox/regular/neutral/DBBadge-should-match-screenshot.png
diff --git a/...adge/showcase/mobile-chrome/regular/neutral/DBBadge-should-match-screenshot.png b/...adge/showcase/mobile-chrome/regular/neutral/DBBadge-should-match-screenshot.png
diff --git a/...adge/showcase/mobile-safari/regular/neutral/DBBadge-should-match-screenshot.png b/...adge/showcase/mobile-safari/regular/neutral/DBBadge-should-match-screenshot.png
diff --git a/...ots__/badge/showcase/webkit/regular/neutral/DBBadge-should-match-screenshot.png b/...ots__/badge/showcase/webkit/regular/neutral/DBBadge-should-match-screenshot.png
diff --git a/output/react/package.json b/output/react/package.json
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@axe-core/playwright": "^4.8.5",
     "@playwright/experimental-ct-react": "1.42.1",
-    "@types/react": "^18.2.72",
+    "@types/react": "^18.2.73",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "sass": "^1.72.0"

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/components/src/components/badge/badge.scss b/packages/components/src/components/badge/badge.scss
@@ -37,14 +37,14 @@
 }
 
 .db-badge {
-	--badge-size: #{variables.$db-spacing-fixed-sm};
+	--badge-size: #{variables.$db-spacing-fixed-xs};
 	@extend %component-border;
-	@extend %db-overwrite-font-size-sm;
+	@extend %db-overwrite-font-size-2xs;
 	@extend %default-button;
 
 	@include tag-components.get-tag-colors();
 	border-radius: 42px; // extreme radius
-	padding-inline: variables.$db-spacing-fixed-xs;
+	padding-inline: variables.$db-spacing-fixed-2xs;
 	block-size: fit-content;
 	inline-size: fit-content;
 
@@ -56,31 +56,31 @@
 	}
 
 	&:has(.db-icon) {
-		padding: variables.$db-spacing-fixed-2xs;
+		padding: variables.$db-spacing-fixed-3xs;
 	}
 
 	& > *,
 	.db-icon {
-		@extend %db-overwrite-font-size-sm;
+		@extend %db-overwrite-font-size-2xs;
 	}
 
-	&[data-size="small"] {
-		--badge-size: #{variables.$db-spacing-fixed-xs};
-		@extend %db-overwrite-font-size-2xs;
-		padding-inline: variables.$db-spacing-fixed-2xs;
+	&[data-size="medium"] {
+		--badge-size: #{variables.$db-spacing-fixed-sm};
+		@extend %db-overwrite-font-size-sm;
+		padding-inline: variables.$db-spacing-fixed-xs;
 
 		&:empty,
 		> span:empty {
 			padding: 0;
 		}
 
 		&:has(.db-icon) {
-			padding: variables.$db-spacing-fixed-3xs;
+			padding: variables.$db-spacing-fixed-2xs;
 		}
 
 		& > *,
 		.db-icon {
-			@extend %db-overwrite-font-size-2xs;
+			@extend %db-overwrite-font-size-sm;
 		}
 	}
 

diff --git a/packages/foundations/package.json b/packages/foundations/package.json
@@ -40,7 +40,7 @@
     "@csstools/normalize.css": "12.1.1"
   },
   "devDependencies": {
-    "@zeplin/sdk": "^1.18.0",
+    "@zeplin/sdk": "^1.19.0",
     "cpr": "3.0.1",
     "cssnano": "^6.1.2",
     "dotenv": "^16.4.5",

diff --git a/showcases/patternhub/package.json b/showcases/patternhub/package.json
@@ -36,7 +36,7 @@
     "@next/mdx": "^14.1.4",
     "@types/dompurify": "3.0.5",
     "@types/node": "20.11.30",
-    "@types/react": "18.2.72",
+    "@types/react": "18.2.73",
     "@types/react-dom": "18.2.22",
     "esbuild": "0.20.2",
     "eslint": "8.57.0",

diff --git a/showcases/react-showcase/package.json b/showcases/react-showcase/package.json
@@ -19,7 +19,7 @@
     "react-router-dom": "6.22.3"
   },
   "devDependencies": {
-    "@types/react": "^18.2.72",
+    "@types/react": "^18.2.73",
     "@types/react-dom": "^18.2.22",
     "@vitejs/plugin-react": "^4.2.1",
     "cross-env": "^7.0.3",

diff --git a/showcases/shared/badge.json b/showcases/shared/badge.json
@@ -71,6 +71,12 @@
 					"variant": "warning"
 				}
 			},
+			{
+				"name": "Adaptive Strong",
+				"props": {
+					"emphasis": "strong"
+				}
+			},
 			{
 				"name": "Neutral Strong",
 				"props": {
@@ -113,13 +119,13 @@
 		"examples": [
 			{
 				"name": "Small (Default)",
-				"props": {
-					"size": "small"
-				}
+				"props": {}
 			},
 			{
 				"name": "Medium",
-				"props": {}
+				"props": {
+					"size": "medium"
+				}
 			}
 		]
 	},
@@ -131,29 +137,35 @@
 				"props": {}
 			},
 			{
-				"name": "Dot",
+				"name": "Text (Default) - Medium",
 				"props": {
-					"noContent": true
+					"size": "medium"
 				}
 			},
 			{
 				"name": "Dot - Small",
+				"props": {
+					"noContent": true
+				}
+			},
+			{
+				"name": "Dot - Medium",
 				"props": {
 					"noContent": true,
-					"size": "small"
+					"size": "medium"
 				}
 			},
 			{
-				"name": "Icon",
+				"name": "Icon - Small",
 				"props": {
 					"example": "icon"
 				}
 			},
 			{
-				"name": "Icon - Small",
+				"name": "Icon - Medium",
 				"props": {
 					"example": "icon",
-					"size": "small"
+					"size": "medium"
 				}
 			}
 		]