diff --git a/packages/ui/src/Checkbox/Item.vue b/packages/ui/src/Checkbox/Item.vue index 641c7962083..478a0f0e3d8 100644 --- a/packages/ui/src/Checkbox/Item.vue +++ b/packages/ui/src/Checkbox/Item.vue @@ -35,8 +35,8 @@ const checkboxClasses = computed(() => { 'shadow-ui-xs mt-0.5 cursor-default rounded-sm border border-gray-400/75 bg-white', 'dark:bg-gray-500 dark:border-gray-900', 'data-[state=checked]:border-ui-accent-bg data-[state=checked]:bg-ui-accent-bg', - 'dark:border-none dark:data-[state=checked]:bg-dark-ui-accent-bg dark:data-[state=checked]:border-dark-ui-accent-bg', - 'dark:data-[disabled]:bg-dark-ui-accent-bg/60 dark:data-[disabled]:border-dark-ui-accent-bg/70', + 'dark:border-none', + 'dark:data-[disabled]:bg-ui-accent-bg/60 dark:data-[disabled]:border-ui-accent-bg/70', 'dark:data-[disabled]:text-gray-400 dark:data-[disabled]:cursor-not-allowed', 'shrink-0' ], diff --git a/packages/ui/src/Radio/Item.vue b/packages/ui/src/Radio/Item.vue index d0ada2af6be..6c80eb2a7bd 100644 --- a/packages/ui/src/Radio/Item.vue +++ b/packages/ui/src/Radio/Item.vue @@ -28,7 +28,7 @@ const id = useId(); class=" relative flex h-full w-full items-center justify-center rounded-[50%] border border-ui-accent-bg after:block after:h-[0.5rem] after:w-[0.5rem] after:rounded-[50%] - after:bg-ui-accent-bg after:content-[''] dark:border-none dark:after:bg-dark-ui-accent-bg + after:bg-ui-accent-bg after:content-[''] dark:border-none " /> diff --git a/packages/ui/src/Switch.vue b/packages/ui/src/Switch.vue index 88aad03849d..574b79221b8 100644 --- a/packages/ui/src/Switch.vue +++ b/packages/ui/src/Switch.vue @@ -17,8 +17,7 @@ const switchRootClasses = cva({ 'relative flex rounded-full shrink-0 border-2', 'transition-colors cursor-pointer', 'data-[state=checked]:shadow-inner data-[state=checked]:border-switch-bg data-[state=checked]:bg-switch-bg', - 'dark:data-[state=checked]:border-dark-switch-bg dark:data-[state=checked]:bg-dark-switch-bg', - 'data-[state=unchecked]:border-transparent dark:data-[state=checked]:border-dark-switch-bg dark:[.publish-fields_&]:data-[state=checked]:border-gray-800', + 'data-[state=unchecked]:border-transparent dark:[.publish-fields_&]:data-[state=checked]:border-gray-800', 'data-[state=unchecked]:bg-gray-200 dark:data-[state=unchecked]:bg-gray-700' ], variants: { diff --git a/packages/ui/src/ui.css b/packages/ui/src/ui.css index 220db0be33a..3c4ab143c5e 100644 --- a/packages/ui/src/ui.css +++ b/packages/ui/src/ui.css @@ -21,21 +21,13 @@ --color-body-bg: var(--theme-color-body-bg); --color-body-border: var(--theme-color-body-border); - --color-dark-body-bg: var(--theme-color-dark-body-bg); - --color-dark-body-border: var(--theme-color-dark-body-border); --color-content-border: var(--theme-color-content-border); - --color-dark-content-bg: var(--theme-color-dark-content-bg); - --color-dark-content-border: var(--theme-color-dark-content-border); --color-global-header-bg: var(--theme-color-global-header-bg); - --color-dark-global-header-bg: var(--theme-color-dark-global-header-bg); --color-progress-bar: var(--theme-color-progress-bar); --color-focus-outline: var(--theme-color-focus-outline); --color-ui-accent-bg: var(--theme-color-ui-accent-bg); --color-ui-accent-text: var(--theme-color-ui-accent-text); - --color-dark-ui-accent-bg: var(--theme-color-dark-ui-accent-bg); - --color-dark-ui-accent-text: var(--theme-color-dark-ui-accent-text); --color-switch-bg: var(--theme-color-switch-bg); - --color-dark-switch-bg: var(--theme-color-dark-switch-bg); /* Temp */ --color-dark-100: #dfe1e5; diff --git a/resources/css/app.css b/resources/css/app.css index ecf837f4776..34af4e8d3d7 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -63,7 +63,7 @@ @layer components { .content-card { - @apply min-h-full px-2 sm:px-6 md:px-12 pb-6 border dark:bg-dark-content-bg dark:border-y-0 dark:border-r-0 border-content-border dark:border-dark-content-border sm:rounded-2xl sm:rounded-r-xl sm:dark:rounded-none; + @apply min-h-full px-2 sm:px-6 md:px-12 pb-6 border dark:border-y-0 dark:border-r-0 border-content-border sm:rounded-2xl sm:rounded-r-xl sm:dark:rounded-none; background: var(--theme-color-content-bg); .nav-closed & { @apply sm:rounded-xl; @@ -72,7 +72,4 @@ } } } - .dark .content-card { - background: var(--theme-color-dark-content-bg); - } } diff --git a/resources/css/components/fieldtypes/bard.css b/resources/css/components/fieldtypes/bard.css index 5f0d677c7d7..43440a7f454 100644 --- a/resources/css/components/fieldtypes/bard.css +++ b/resources/css/components/fieldtypes/bard.css @@ -207,7 +207,7 @@ } .bard-footer-toolbar { - @apply flex items-center justify-between rounded-b-lg border-t bg-white p-2 text-xs text-gray-700 shadow-none dark:border-dark-300 dark:bg-dark-800 dark:text-dark-175; + @apply flex items-center justify-between rounded-b-lg border-t bg-white p-2 text-xs text-gray-700 shadow-none dark:border-gray-700 dark:bg-gray-900 dark:text-gray-400; padding: 8px 12px; .bard-fullscreen & { diff --git a/resources/css/components/fieldtypes/table.css b/resources/css/components/fieldtypes/table.css index 2d69e30f936..8e3ca696245 100644 --- a/resources/css/components/fieldtypes/table.css +++ b/resources/css/components/fieldtypes/table.css @@ -64,7 +64,7 @@ Table Fieldtype @apply outline-hidden dark:bg-gray-900; th { - @apply bg-gray-50 p-2 text-sm font-medium text-gray-700 text-start border-r border-b border-gray-300 dark:border-dark-600 dark:bg-gray-925 dark:text-gray-100 overflow-hidden; + @apply bg-gray-50 p-2 text-sm font-medium text-gray-700 text-start border-r border-b border-gray-300 dark:border-gray-700 dark:bg-gray-925 dark:text-gray-100 overflow-hidden; tr:first-child & { @apply rounded-tl-lg; @@ -101,7 +101,7 @@ Table Fieldtype } td { - @apply border-b p-0 dark:border-dark-600 border-e; + @apply border-b p-0 dark:border-gray-700 border-e; &:first-child.grid-cell { @apply ps-4; diff --git a/resources/css/components/pagination.css b/resources/css/components/pagination.css index 9db91ac38c2..7a1e25137f1 100644 --- a/resources/css/components/pagination.css +++ b/resources/css/components/pagination.css @@ -9,7 +9,7 @@ @apply block h-full bg-white px-3 py-2 text-gray-900 dark:border-dark-900 dark:bg-dark-600 dark:text-dark-150 ltr:border-r rtl:border-l; &:hover { - @apply bg-gray-100 text-gray-900 dark:bg-dark-700 dark:text-dark-100; + @apply bg-gray-100 text-gray-900 dark:bg-gray-850 dark:text-dark-100; } } @@ -26,7 +26,7 @@ } li.current a { - @apply bg-gray-100 text-blue-600 shadow-inner dark:bg-dark-700 dark:text-dark-blue-100; + @apply bg-gray-100 text-blue-600 shadow-inner dark:bg-gray-850 dark:text-dark-blue-100; } } diff --git a/resources/css/components/publish.css b/resources/css/components/publish.css index 3dbfb94c23b..eda5e9a31d4 100644 --- a/resources/css/components/publish.css +++ b/resources/css/components/publish.css @@ -111,7 +111,7 @@ Here flexbox is much better suited to create a layout that grows to fill space. } .publish-section-header { - @apply rounded-t-lg border-b border-gray-400 bg-gray-100 dark:border-dark-900 dark:bg-dark-700; + @apply rounded-t-lg border-b border-gray-400 bg-gray-100 dark:border-dark-900 dark:bg-gray-850; } .publish-section-header-inner { diff --git a/resources/css/elements/base.css b/resources/css/elements/base.css index 81ad66e8fda..2a0f54caf9b 100644 --- a/resources/css/elements/base.css +++ b/resources/css/elements/base.css @@ -115,7 +115,7 @@ code:not(pre *) { color: hsl(from var(--theme-color-ui-accent-bg) h s 30); background: hsl(from var(--theme-color-ui-accent-bg) h s l / 0.08); &:where(.dark, .dark *) { - color: hsl(from var(--theme-color-dark-ui-accent-bg) h s 90); - background: hsl(from var(--theme-color-dark-ui-accent-bg) h s 10 / 0.5); + color: hsl(from var(--theme-color-ui-accent-bg) h s 90); + background: hsl(from var(--theme-color-ui-accent-bg) h s 10 / 0.5); } } \ No newline at end of file diff --git a/resources/js/components/assets/Browser/Table.vue b/resources/js/components/assets/Browser/Table.vue index 738b1b80fd8..ddc97dddaee 100644 --- a/resources/js/components/assets/Browser/Table.vue +++ b/resources/js/components/assets/Browser/Table.vue @@ -101,7 +101,7 @@ @click.native.stop="$emit('edit-asset', asset)" />