fix: more wip work for new ecosystem themes

kiva · Sep 25, 2024 · 90447d4 · 90447d4
1 parent e27b124
commit 90447d4
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 21 deletions.
diff --git a/@kiva/kv-components/vue/KvButton.vue b/@kiva/kv-components/vue/KvButton.vue
@@ -157,9 +157,9 @@ export default {
 				case 'link':
 					classes = 'tw-bg-primary-inverse tw-text-primary-inverse';
 					if (state.value === 'active') {
-						classes = `${classes} tw-border-secondary`;
+						classes = `${classes} tw-border-secondary tw-bg-action`;
 					} else {
-						classes = `${classes} tw-border-primary hover:tw-border-secondary`;
+						classes = `${classes} tw-border-action-highlight hover:tw-border-action hover:tw-bg-action`;
 					}
 					break;
 				case 'ghost':

diff --git a/@kiva/kv-components/vue/KvTextInput.vue b/@kiva/kv-components/vue/KvTextInput.vue
@@ -16,16 +16,19 @@
 				class="
 					tw-h-6 tw-w-full
 					tw-px-2
-					tw-border tw-border-tertiary
+					tw-border
 					tw-rounded-sm
 					tw-appearance-none
 					tw-text-base
-					tw-bg-primary
 					tw-ring-inset
-					focus:tw-outline-none focus:tw-ring-2 focus:tw-ring-action focus:tw-border-transparent
+					focus:tw-outline-none focus:tw-ring-2 focus:tw-border-transparent
 				"
 				:class="{
-					'tw-pr-6 tw-bg-danger tw-border-danger-highlight tw-bg-opacity-low focus:tw-ring-danger-highlight'
+					'tw-bg-primary'
+						: valid && !disabled,
+					'tw-border-tertiary focus:tw-ring-action'
+						: valid,
+					'tw-pr-6 tw-bg-danger-highlight tw-border-danger-highlight tw-bg-opacity-10 focus:tw-ring-danger-highlight'
 						: !valid,
 					'tw-bg-tertiary'
 						: disabled,

diff --git a/@kiva/kv-components/vue/stories/KvThemeProvider.stories.js b/@kiva/kv-components/vue/stories/KvThemeProvider.stories.js
@@ -104,7 +104,7 @@ const demoTemplate = `
 		<section>
 			<ul>
 				<li
-					v-for="variant in ['primary', 'secondary', 'link', 'danger', 'ghost']"
+					v-for="variant in ['primary', 'secondary', 'link', 'danger', 'caution', 'ghost']"
 					:key="variant"
 					class="tw-mb-2"
 				>

diff --git a/@kiva/kv-tokens/configs/tailwind.config.cjs b/@kiva/kv-tokens/configs/tailwind.config.cjs
@@ -105,6 +105,7 @@ module.exports = {
 		},
 		opacity: {
 			0: '0',
+			10: '0.1',
 			low: `${opacity.low}`,
 			full: '1',
 		},

diff --git a/@kiva/kv-tokens/primitives.json b/@kiva/kv-tokens/primitives.json
@@ -83,14 +83,14 @@
 					"action-highlight": "#223829",
 					"danger": "#A24536",
 					"danger-highlight": "#C45F4F",
-					"caution": "#E6CB55",
-					"caution-highlight": "#D9BC3B"
+					"caution": "#F8CD69",
+					"caution-highlight": "#F4B539"
 				},
 				"border": {
-					"primary": "#9E9E9E",
-					"primary-inverse": "#E0E0E0",
-					"secondary": "#276A43",
-					"tertiary": "#78C79F",
+					"primary": "#505050",
+					"primary-inverse": "#FFFFFF",
+					"secondary": "#757575",
+					"tertiary": "#C4C4C4",
 					"action": "#276A43",
 					"action-highlight": "#223829",
 					"danger": "#A24536",
@@ -112,23 +112,23 @@
 					"primary-inverse": "#223829",
 					"secondary": "#F8F2E6",
 					"tertiary": "#F8F2E6",
-					"action": "#F8CD69",
-					"action-highlight": "#F8F2E6"
+					"action": "#2AA967",
+					"action-highlight": "#78C79F"
 				},
 				"background": {
 					"primary": "#223829",
 					"primary-inverse": "#FFFFFF",
-					"secondary": "#EDF4F1",
-					"tertiary": "#223829",
-					"action": "#F8CD69",
-					"action-highlight": "#F8F2E6"
+					"secondary": "#276A43",
+					"tertiary": "#EDF4F1",
+					"action": "#2AA967",
+					"action-highlight": "#78C79F"
 				},
 				"border": {
 					"primary": "#F8F2E6",
 					"primary-inverse": "#593207",
 					"secondary": "#F8CD69",
-					"action": "#F8CD69",
-					"action-highlight": "#F8F2E6"
+					"action": "#2AA967",
+					"action-highlight": "#78C79F"
 				},
 				"heading-underline": {
 					"primary": "#F8CD69"