diff --git a/.stylelintrc.js b/.stylelintrc.js index 35283dbc1c..498a4d18b9 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -15,6 +15,7 @@ module.exports = { rules: { // Disallow relative font units 'unit-disallowed-list': ['rem', 'em'], + '@kong/design-tokens/use-proper-token': true, // Only allow @kong/design-tokens or `--kong-ui-*` CSS custom properties 'custom-property-pattern': [ "^(kui-|kong-ui-).+$", @@ -28,6 +29,9 @@ module.exports = { } } ], - plugins: [ 'stylelint-order' ], + plugins: [ + 'stylelint-order', + '@kong/design-tokens/stylelint-plugin', + ], rules: { 'order/properties-alphabetical-order': true } } diff --git a/package.json b/package.json index 0b7a944286..a5dc9cdc89 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@commitlint/config-conventional": "^18.4.3", "@digitalroute/cz-conventional-changelog-for-jira": "^8.0.1", "@evilmartians/lefthook": "^1.5.5", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "@rushstack/eslint-patch": "^1.5.1", "@types/flat": "^5.0.5", diff --git a/packages/analytics/analytics-chart/package.json b/packages/analytics/analytics-chart/package.json index f2f3ace9ea..de2c039b10 100644 --- a/packages/analytics/analytics-chart/package.json +++ b/packages/analytics/analytics-chart/package.json @@ -27,7 +27,7 @@ "devDependencies": { "@kong-ui-public/i18n": "workspace:^", "@kong-ui-public/sandbox-layout": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "@types/uuid": "^9.0.7", "file-saver": "^2.0.5", diff --git a/packages/analytics/analytics-chart/src/components/chart-plugins/ChartLegend.vue b/packages/analytics/analytics-chart/src/components/chart-plugins/ChartLegend.vue index 49dbf8c243..04b2204cd6 100644 --- a/packages/analytics/analytics-chart/src/components/chart-plugins/ChartLegend.vue +++ b/packages/analytics/analytics-chart/src/components/chart-plugins/ChartLegend.vue @@ -273,12 +273,12 @@ const positionToClass = (position: `${ChartLegendPosition}`) => { .label { font-size: $kui-font-size-30; - line-height: $kui-font-size-50; + line-height: $kui-line-height-50; } .sub-label { font-size: $kui-font-size-20; - line-height: $kui-font-size-30; + line-height: $kui-line-height-20; word-break: none; } diff --git a/packages/analytics/analytics-chart/src/components/chart-plugins/ChartTooltip.vue b/packages/analytics/analytics-chart/src/components/chart-plugins/ChartTooltip.vue index 0e6743fa48..c148f96e1a 100644 --- a/packages/analytics/analytics-chart/src/components/chart-plugins/ChartTooltip.vue +++ b/packages/analytics/analytics-chart/src/components/chart-plugins/ChartTooltip.vue @@ -221,7 +221,7 @@ function handleMouseUp() { display: flex; flex-direction: column; margin: $kui-space-40; - min-height: $kui-space-80; + min-height: 24px; padding-bottom: $kui-space-40; .title { diff --git a/packages/analytics/analytics-utilities/package.json b/packages/analytics/analytics-utilities/package.json index 31119fa41c..80313e4656 100644 --- a/packages/analytics/analytics-utilities/package.json +++ b/packages/analytics/analytics-utilities/package.json @@ -60,6 +60,6 @@ "date-fns-tz": "^2.0.0" }, "devDependencies": { - "@kong/design-tokens": "^1.12.1" + "@kong/design-tokens": "1.12.3" } } diff --git a/packages/analytics/dashboard-renderer/package.json b/packages/analytics/dashboard-renderer/package.json index da57d9c8c8..3705ba55d6 100644 --- a/packages/analytics/dashboard-renderer/package.json +++ b/packages/analytics/dashboard-renderer/package.json @@ -41,7 +41,7 @@ "@kong-ui-public/analytics-chart": "workspace:^", "@kong-ui-public/i18n": "workspace:^", "@kong-ui-public/sandbox-layout": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "json-schema-to-ts": "^2.9.2", "vue": "^3.3.11" diff --git a/packages/analytics/metric-cards/package.json b/packages/analytics/metric-cards/package.json index a021329e6a..d7ad797315 100644 --- a/packages/analytics/metric-cards/package.json +++ b/packages/analytics/metric-cards/package.json @@ -42,7 +42,7 @@ "vue": "^3.3.11" }, "devDependencies": { - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "vue": "^3.3.11" }, diff --git a/packages/analytics/metric-cards/src/components/display/MetricsCard.vue b/packages/analytics/metric-cards/src/components/display/MetricsCard.vue index fc510e1e40..17f1738b6f 100644 --- a/packages/analytics/metric-cards/src/components/display/MetricsCard.vue +++ b/packages/analytics/metric-cards/src/components/display/MetricsCard.vue @@ -329,7 +329,7 @@ $row-gap-size: 12px; } &.negative { background-color: var(--kong-ui-metric-card-trend-bg-negative, $kui-color-background-danger-weakest); - color: var(--kong-ui-metric-card-trend-negative, $kui-color-border-danger-strong); + color: var(--kong-ui-metric-card-trend-negative, $kui-color-text-danger-strong); } &.neutral { background-color: var(--kong-ui-metric-card-trend-bg-neutral, $kui-color-background-neutral-weaker); diff --git a/packages/core/app-layout/package.json b/packages/core/app-layout/package.json index 784f884391..b252bcf684 100644 --- a/packages/core/app-layout/package.json +++ b/packages/core/app-layout/package.json @@ -49,7 +49,7 @@ "lodash.clonedeep": "^4.5.0" }, "devDependencies": { - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "@types/lodash.clonedeep": "^4.5.9", "vue": "^3.3.11", diff --git a/packages/core/app-layout/src/components/aboutSection/AppAboutSection.vue b/packages/core/app-layout/src/components/aboutSection/AppAboutSection.vue index 5def3dba1e..d86829a081 100644 --- a/packages/core/app-layout/src/components/aboutSection/AppAboutSection.vue +++ b/packages/core/app-layout/src/components/aboutSection/AppAboutSection.vue @@ -205,7 +205,7 @@ const displayModified = computed(() => { :deep(hr), hr { - background-color: $kui-color-border; + background-color: $kui-color-background-disabled; border: none; height: 1px; margin: $kui-space-0; diff --git a/packages/core/app-layout/src/components/navbar/AccountDropdown.vue b/packages/core/app-layout/src/components/navbar/AccountDropdown.vue index 5789ac7844..8d3aba5aee 100644 --- a/packages/core/app-layout/src/components/navbar/AccountDropdown.vue +++ b/packages/core/app-layout/src/components/navbar/AccountDropdown.vue @@ -73,7 +73,7 @@ defineProps({ &:focus-visible { border-radius: $kui-border-radius-round; - outline: $kui-border-width-10 solid $kui-navigation-color-text !important; + outline: 1px solid #bee2ff !important; outline-offset: 2px; } } diff --git a/packages/core/app-layout/src/components/sidebar/AppSidebar.vue b/packages/core/app-layout/src/components/sidebar/AppSidebar.vue index 259daaaef6..28c8c52652 100644 --- a/packages/core/app-layout/src/components/sidebar/AppSidebar.vue +++ b/packages/core/app-layout/src/components/sidebar/AppSidebar.vue @@ -410,6 +410,7 @@ onBeforeUnmount(() => { } .sidebar-level-divider { + /* stylelint-disable-next-line @kong/design-tokens/use-proper-token */ background-color: $kui-navigation-color-border-divider; height: 1px; margin: $kui-space-80 auto; diff --git a/packages/core/app-layout/src/components/sidebar/SidebarItem.vue b/packages/core/app-layout/src/components/sidebar/SidebarItem.vue index efd324de65..6b7da42982 100644 --- a/packages/core/app-layout/src/components/sidebar/SidebarItem.vue +++ b/packages/core/app-layout/src/components/sidebar/SidebarItem.vue @@ -225,6 +225,7 @@ const navigate = (event: Event, item: SidebarPrimaryItem | SidebarSecondaryItem, // Add a top border to the ul element, offset from the left and right to prevent overlap &:before { + /* stylelint-disable-next-line @kong/design-tokens/use-proper-token */ background-color: $kui-navigation-color-border; content: ''; height: 1px; @@ -350,7 +351,7 @@ const navigate = (event: Event, item: SidebarPrimaryItem | SidebarSecondaryItem, span { height: auto; - min-width: $kui-space-0; // Important: must be present to truncate the text + min-width: 0; // Important: must be present to truncate the text } } } diff --git a/packages/core/copy-uuid/package.json b/packages/core/copy-uuid/package.json index 30888da21a..2e15fcd1d0 100644 --- a/packages/core/copy-uuid/package.json +++ b/packages/core/copy-uuid/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@kong-ui-public/i18n": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "vue": "^3.3.11" }, diff --git a/packages/core/core/package.json b/packages/core/core/package.json index ee8d52eb80..ff33ee8f39 100644 --- a/packages/core/core/package.json +++ b/packages/core/core/package.json @@ -58,7 +58,7 @@ "date-fns": "^2.30.0" }, "devDependencies": { - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "axios": "^1.6.2", "swrv": "^1.0.4" } diff --git a/packages/core/documentation/package.json b/packages/core/documentation/package.json index ce280918fd..49c9c1f45f 100644 --- a/packages/core/documentation/package.json +++ b/packages/core/documentation/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "@kong-ui-public/i18n": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "axios": "^1.6.2", "vue": "^3.3.11" diff --git a/packages/core/error-boundary/package.json b/packages/core/error-boundary/package.json index df16ebab7b..19311cd77b 100644 --- a/packages/core/error-boundary/package.json +++ b/packages/core/error-boundary/package.json @@ -38,7 +38,7 @@ "test:unit:open": "cross-env FORCE_COLOR=1 vitest --ui" }, "devDependencies": { - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/icons": "^1.8.3", "vue": "^3.3.11" }, diff --git a/packages/core/forms/package.json b/packages/core/forms/package.json index 138044f23e..6a2fdb34fd 100644 --- a/packages/core/forms/package.json +++ b/packages/core/forms/package.json @@ -60,7 +60,7 @@ }, "devDependencies": { "@kong-ui-public/i18n": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "@types/lodash": "^4.14.202", "pug": "^3.0.2" diff --git a/packages/core/sandbox-layout/package.json b/packages/core/sandbox-layout/package.json index 8edd53b766..4485a3d19b 100644 --- a/packages/core/sandbox-layout/package.json +++ b/packages/core/sandbox-layout/package.json @@ -38,7 +38,7 @@ "test:unit:open": "cross-env FORCE_COLOR=1 vitest --ui" }, "devDependencies": { - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "vue": "^3.3.11", "vue-router": "^4.2.5" diff --git a/packages/entities/entities-certificates/package.json b/packages/entities/entities-certificates/package.json index 933e0ef045..45012a57d1 100644 --- a/packages/entities/entities-certificates/package.json +++ b/packages/entities/entities-certificates/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@kong-ui-public/i18n": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "axios": "^1.6.2", "vue": "^3.3.11", diff --git a/packages/entities/entities-consumer-credentials/package.json b/packages/entities/entities-consumer-credentials/package.json index f0ce57fbed..f12d0d6827 100644 --- a/packages/entities/entities-consumer-credentials/package.json +++ b/packages/entities/entities-consumer-credentials/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@kong-ui-public/copy-uuid": "workspace:^", "@kong-ui-public/i18n": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "axios": "^1.6.2", "vue": "^3.3.11", diff --git a/packages/entities/entities-consumer-groups/package.json b/packages/entities/entities-consumer-groups/package.json index 969fe2eab1..3ad8eac467 100644 --- a/packages/entities/entities-consumer-groups/package.json +++ b/packages/entities/entities-consumer-groups/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@kong-ui-public/i18n": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "axios": "^1.6.2", "vue": "^3.3.11", diff --git a/packages/entities/entities-consumers/package.json b/packages/entities/entities-consumers/package.json index 96375a101a..b6d63d92af 100644 --- a/packages/entities/entities-consumers/package.json +++ b/packages/entities/entities-consumers/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@kong-ui-public/i18n": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "axios": "^1.6.2", "vue": "^3.3.11", diff --git a/packages/entities/entities-gateway-services/package.json b/packages/entities/entities-gateway-services/package.json index d8ed6aa74d..396611b67a 100644 --- a/packages/entities/entities-gateway-services/package.json +++ b/packages/entities/entities-gateway-services/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@kong-ui-public/i18n": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "axios": "^1.6.2", "vue": "^3.3.11", diff --git a/packages/entities/entities-keys/package.json b/packages/entities/entities-keys/package.json index 01d10ee486..79f0b73d13 100644 --- a/packages/entities/entities-keys/package.json +++ b/packages/entities/entities-keys/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@kong-ui-public/copy-uuid": "workspace:^", "@kong-ui-public/i18n": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "axios": "^1.6.2", "vue": "^3.3.11", diff --git a/packages/entities/entities-keys/src/components/KeyForm.vue b/packages/entities/entities-keys/src/components/KeyForm.vue index 0d83236fd6..16768b8f27 100644 --- a/packages/entities/entities-keys/src/components/KeyForm.vue +++ b/packages/entities/entities-keys/src/components/KeyForm.vue @@ -476,7 +476,7 @@ onBeforeMount(async () => { } .invalid-key-set-message { - color: $kui-color-background-danger; + color: $kui-color-text-danger; font-size: 11px; font-weight: 500; margin-top: 3px !important; diff --git a/packages/entities/entities-plugins/package.json b/packages/entities/entities-plugins/package.json index 0f82fa0ed2..0e05ef8023 100644 --- a/packages/entities/entities-plugins/package.json +++ b/packages/entities/entities-plugins/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@kong-ui-public/i18n": "workspace:^", - "@kong/design-tokens": "^1.12.1", + "@kong/design-tokens": "1.12.3", "@kong/kongponents": "9.0.0-alpha.73", "axios": "^1.6.2", "vue": "^3.3.11", diff --git a/packages/entities/entities-plugins/src/components/select/PluginCardSkeleton.vue b/packages/entities/entities-plugins/src/components/select/PluginCardSkeleton.vue index 654636c4d4..c7208b5894 100644 --- a/packages/entities/entities-plugins/src/components/select/PluginCardSkeleton.vue +++ b/packages/entities/entities-plugins/src/components/select/PluginCardSkeleton.vue @@ -35,6 +35,7 @@ defineProps({