(
{icon ? (
diff --git a/packages/ui/src/components/select.tsx b/packages/ui/src/components/select.tsx
index a459c61919..881e6ce288 100644
--- a/packages/ui/src/components/select.tsx
+++ b/packages/ui/src/components/select.tsx
@@ -89,7 +89,7 @@ const SelectTrigger = forwardRef<
span]:line-clamp-1',
+ 'border-borders-2 ring-offset-background flex h-9 w-full items-center justify-between whitespace-nowrap rounded border bg-input-background px-3 py-2 text-sm focus-visible:outline-none focus-visible:rounded disabled:cursor-not-allowed disabled:border-borders-2 [&>span]:line-clamp-1',
className
)}
{...props}
diff --git a/packages/ui/src/components/stacked-list.tsx b/packages/ui/src/components/stacked-list.tsx
index 15a28e91eb..b69e01954d 100644
--- a/packages/ui/src/components/stacked-list.tsx
+++ b/packages/ui/src/components/stacked-list.tsx
@@ -72,7 +72,7 @@ const List: React.FC = ({
},
onlyTopRounded ? 'rounded-t-md' : 'rounded-md',
withoutBorder ? 'border-none' : '',
- borderBackground ? 'border-borders-1' : '',
+ borderBackground ? 'border-borders-2' : '',
className
)}
{...props}
diff --git a/packages/ui/src/components/table.tsx b/packages/ui/src/components/table.tsx
index 1ba8a51c29..f005d9bbcd 100644
--- a/packages/ui/src/components/table.tsx
+++ b/packages/ui/src/components/table.tsx
@@ -36,7 +36,7 @@ TableRoot.displayName = 'TableRoot'
const TableHeader = forwardRef>(
({ className, ...props }, ref) => (
-
+
)
)
TableHeader.displayName = 'TableHeader'
diff --git a/packages/ui/src/components/tabs.tsx b/packages/ui/src/components/tabs.tsx
index ea2163901f..ab765fd353 100644
--- a/packages/ui/src/components/tabs.tsx
+++ b/packages/ui/src/components/tabs.tsx
@@ -20,7 +20,7 @@ const tabsListVariants = cva('inline-flex items-center text-foreground-4', {
*/
navigation: 'h-[44px] w-full justify-start gap-6 border-b border-borders-5 px-5',
tabnav:
- 'relative flex w-full before:absolute before:bottom-0 before:left-0 before:h-px before:w-full before:bg-borders-1'
+ 'relative flex w-full before:absolute before:bottom-0 before:left-0 before:h-px before:w-full before:bg-borders-3'
},
fontSize: {
xs: 'text-12',
@@ -53,7 +53,7 @@ const tabsTriggerVariants = cva(
navigation:
'm-0 -mb-px h-[44px] border-b-2 border-solid border-b-transparent px-0 font-normal text-foreground-2 duration-150 ease-in-out hover:text-foreground-1 data-[state=active]:border-borders-9',
tabnav:
- 'h-9 rounded-t-md border-x border-t border-transparent px-3.5 font-normal text-foreground-2 hover:text-foreground-1 data-[state=active]:border-borders-1 data-[state=active]:bg-background-1 data-[state=active]:text-foreground-1'
+ 'h-9 rounded-t-md border-x border-t border-transparent px-3.5 font-normal text-foreground-2 hover:text-foreground-1 data-[state=active]:border-borders-2 data-[state=active]:bg-background-1 data-[state=active]:text-foreground-1'
}
},
defaultVariants: {
diff --git a/packages/ui/src/components/textarea.tsx b/packages/ui/src/components/textarea.tsx
index c13ec148e5..ad78bfc032 100644
--- a/packages/ui/src/components/textarea.tsx
+++ b/packages/ui/src/components/textarea.tsx
@@ -32,7 +32,7 @@ const Textarea = forwardRef(
className,
error
? 'border-borders-danger'
- : 'border-borders-2 focus-visible:border-borders-3 disabled:placeholder:text-foreground-9 disabled:border-borders-1'
+ : 'border-borders-2 focus-visible:border-borders-3 disabled:placeholder:text-foreground-9 disabled:border-borders-2'
)}
id={id}
disabled={disabled}
diff --git a/packages/ui/src/components/toast/toast.tsx b/packages/ui/src/components/toast/toast.tsx
index 8c231ca6ec..61965af274 100644
--- a/packages/ui/src/components/toast/toast.tsx
+++ b/packages/ui/src/components/toast/toast.tsx
@@ -27,7 +27,7 @@ const toastVariants = cva(
{
variants: {
variant: {
- default: 'border-borders-1 bg-background-3 text-foreground [&_svg]:text-icons-1',
+ default: 'border-borders-2 bg-background-3 text-foreground [&_svg]:text-icons-1',
destructive: 'border-borders-danger bg-foreground-danger text-foreground-1 [&_svg]:text-icons-2',
success:
'border-borders-success border-tag-border-mint-1 bg-tag-background-mint-1 text-tag-foreground-mint-1 [&_svg]:text-icons-2'
diff --git a/packages/ui/src/fonts/InterVariable.woff2 b/packages/ui/src/fonts/InterVariable.woff2
new file mode 100644
index 0000000000..5a8d3e72ad
Binary files /dev/null and b/packages/ui/src/fonts/InterVariable.woff2 differ
diff --git a/packages/ui/src/shared-style-variables.css b/packages/ui/src/shared-style-variables.css
index d813fb5b96..29f3632079 100644
--- a/packages/ui/src/shared-style-variables.css
+++ b/packages/ui/src/shared-style-variables.css
@@ -1,3 +1,6 @@
+/* move to shared styles */
+@import url('@harnessio/core-design-system/enterprise-themes');
+
:root,
:host {
/* PP Figma shades */
diff --git a/packages/ui/src/styles.css b/packages/ui/src/styles.css
index 86b351a35e..319468a7b3 100644
--- a/packages/ui/src/styles.css
+++ b/packages/ui/src/styles.css
@@ -1,4 +1,7 @@
-@import url('./shared-style-variables.css');
+/* @import url('./shared-style-variables.css'); */
+
+@import url('@harnessio/core-design-system/core-styles');
+@import url('@harnessio/core-design-system/oss-themes');
@tailwind base;
@tailwind components;
@@ -8,14 +11,14 @@
font-family: 'Inter';
font-style: normal;
font-weight: 300 500;
- src: url('./fonts/InterVariable.ttf') format('truetype');
+ src: url('./fonts/InterVariable.woff2') format('woff2');
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 700;
- src: url('./fonts/InterVariable.ttf') format('truetype');
+ src: url('./fonts/InterVariable.woff2') format('woff2');
}
@font-face {
@@ -711,9 +714,9 @@
}
@layer base {
- * {
- @apply border-borders-1;
- }
+ /* * {
+ @apply border-borders-3;
+ } */
html {
@apply text-base antialiased;
@@ -1174,7 +1177,7 @@ mark {
}
.monaco-diff-editor.side-by-side .editor.modified {
- @apply !border-borders-1 !border-l !border-solid !shadow-none;
+ @apply !border-borders-2 !border-l !border-solid !shadow-none;
}
/* In View Diff Renderer */
diff --git a/packages/ui/src/views/execution/step-execution.tsx b/packages/ui/src/views/execution/step-execution.tsx
index 00ce0167ef..35dca610fd 100644
--- a/packages/ui/src/views/execution/step-execution.tsx
+++ b/packages/ui/src/views/execution/step-execution.tsx
@@ -31,16 +31,16 @@ const StepExecutionToolbar: FC<
-