Merge branch 'main' into B2B-88
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
body {
|
||||
@apply bg-background text-foreground;
|
||||
font-feature-settings: "rlig" 1, "calt" 1;
|
||||
/* @apply font-sans */
|
||||
}
|
||||
|
||||
*,
|
||||
@@ -46,4 +47,10 @@
|
||||
textarea::placeholder {
|
||||
color: theme(--color-muted-foreground);
|
||||
}
|
||||
|
||||
|
||||
h1,h2,h3,h4,h5,h6 {
|
||||
@apply font-heading text-foreground text-2xl font-semibold tracking-tight
|
||||
}
|
||||
|
||||
}
|
||||
@@ -8,38 +8,39 @@
|
||||
|
||||
@layer base {
|
||||
:root {
|
||||
--font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
|
||||
--font-heading: var(--font-sans);
|
||||
|
||||
--font-sans: var(--font-sans) -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
|
||||
--font-heading: var(--font-heading);
|
||||
|
||||
--background: var(--color-white);
|
||||
--foreground: var(--color-neutral-950);
|
||||
--foreground: hsla(240, 10%, 4%, 1);
|
||||
|
||||
--card: var(--color-white);
|
||||
--card-foreground: var(--color-neutral-950);
|
||||
|
||||
--popover: var(--color-white);
|
||||
--popover-foreground: var(--color-neutral-950);
|
||||
--popover-foreground: hsla(240, 10%, 4%, 1);
|
||||
|
||||
--primary: var(--color-neutral-950);
|
||||
--primary-foreground: var(--color-white);
|
||||
--primary: hsla(145, 78%, 18%, 1);
|
||||
--primary-foreground: hsla(356, 100%, 97%, 1);
|
||||
|
||||
--secondary: oklch(96.76% 0.0013 286.38);
|
||||
--secondary-foreground: oklch(21.03% 0.0318 264.65);
|
||||
--secondary: hsla(240, 5%, 96%, 1);
|
||||
--secondary-foreground: hsla(240, 6%, 10%, 1);
|
||||
|
||||
--muted: oklch(96.71% 0.0029 264.54);
|
||||
--muted-foreground: oklch(55.13% 0.0233 264.36);
|
||||
--muted: hsla(240, 5%, 96%, 1);
|
||||
--muted-foreground: hsla(240, 4%, 41%, 1);
|
||||
|
||||
--accent: oklch(96.76% 0.0013 286.38);
|
||||
--accent-foreground: oklch(21.03% 0.0318 264.65);
|
||||
--accent: hsla(240, 5%, 96%, 1);
|
||||
--accent-foreground: hsla(240, 6%, 10%, 1);
|
||||
|
||||
--destructive: var(--color-red-500);
|
||||
--destructive-foreground: var(--color-white);
|
||||
--destructive: hsla(0, 84%, 60%, 1);
|
||||
--destructive-foreground: hsla(0, 0%, 98%, 1);
|
||||
|
||||
--border: var(--color-gray-100);
|
||||
--input: var(--color-gray-200);
|
||||
--border: hsla(240, 6%, 90%, 1);
|
||||
--input: hsla(240, 6%, 90%, 1);
|
||||
--ring: var(--color-neutral-800);
|
||||
|
||||
--radius: 0.5rem;
|
||||
--radius: 1rem;
|
||||
|
||||
--chart-1: var(--color-orange-400);
|
||||
--chart-2: var(--color-teal-600);
|
||||
@@ -55,6 +56,7 @@
|
||||
--sidebar-accent-foreground: var(--color-neutral-950);
|
||||
--sidebar-border: var(--border);
|
||||
--sidebar-ring: var(--color-blue-500);
|
||||
/* --foreground: 240 10% 4%; */
|
||||
}
|
||||
|
||||
.dark {
|
||||
@@ -74,7 +76,7 @@
|
||||
--secondary-foreground: oklch(98.43% 0.0017 247.84);
|
||||
|
||||
--muted: var(--color-neutral-800);
|
||||
--muted-foreground: oklch(71.19% 0.0129 286.07);
|
||||
--muted-foreground: hsla(240, 4%, 41%, 1);
|
||||
|
||||
--accent: var(--color-neutral-800);
|
||||
--accent-foreground: oklch(98.48% 0 0);
|
||||
|
||||
@@ -66,6 +66,16 @@
|
||||
--animate-accordion-down: accordion-down 0.2s ease-out;
|
||||
--animate-accordion-up: accordion-up 0.2s ease-out;
|
||||
|
||||
--breakpoint-xs: 30rem;
|
||||
--breakpoint-sm: 48rem;
|
||||
--breakpoint-md: 70rem;
|
||||
--breakpoint-lg: 80rem;
|
||||
--breakpoint-xl: 96rem;
|
||||
--breakpoint-2xl: 100rem;
|
||||
--breakpoint-3xl: 120rem;
|
||||
|
||||
--container-max-width: 80rem;
|
||||
|
||||
@keyframes accordion-down {
|
||||
from {
|
||||
height: 0;
|
||||
|
||||
Reference in New Issue
Block a user