Merge branch 'dev' into patch-2

This commit is contained in:
mrjvs 2024-02-03 22:31:08 +01:00 committed by GitHub
commit e95a681b3c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 15 additions and 5 deletions

View File

@ -104,7 +104,7 @@ function ThemePreview(props: {
<span className="font-medium text-white">{props.name}</span> <span className="font-medium text-white">{props.name}</span>
<span <span
className={classNames( className={classNames(
"inline-block px-3 text-sm transition-opacity duration-150 rounded-full bg-[#27182F] text-white", "inline-block px-3 py-1 leading-tight text-sm transition-opacity duration-150 rounded-full bg-pill-activeBackground text-white/85",
props.active ? "opacity-100" : "opacity-0 pointer-events-none", props.active ? "opacity-100" : "opacity-0 pointer-events-none",
)} )}
> >

View File

@ -97,6 +97,8 @@ export const defaultTheme = {
background: tokens.shade.c300, background: tokens.shade.c300,
backgroundHover: tokens.shade.c200, backgroundHover: tokens.shade.c200,
highlight: tokens.blue.c200, highlight: tokens.blue.c200,
activeBackground: tokens.shade.c300,
}, },
// meta data for the theme itself // meta data for the theme itself

View File

@ -63,7 +63,9 @@ export default createTheme({
pill: { pill: {
background: tokens.shade.c300, background: tokens.shade.c300,
backgroundHover: tokens.shade.c200, backgroundHover: tokens.shade.c200,
highlight: tokens.blue.c200 highlight: tokens.blue.c200,
activeBackground: tokens.shade.c300,
}, },
global: { global: {

View File

@ -63,7 +63,9 @@ export default createTheme({
pill: { pill: {
background: tokens.shade.c300, background: tokens.shade.c300,
backgroundHover: tokens.shade.c200, backgroundHover: tokens.shade.c200,
highlight: tokens.blue.c200 highlight: tokens.blue.c200,
activeBackground: tokens.shade.c300,
}, },
global: { global: {

View File

@ -63,7 +63,9 @@ export default createTheme({
pill: { pill: {
background: tokens.shade.c300, background: tokens.shade.c300,
backgroundHover: tokens.shade.c200, backgroundHover: tokens.shade.c200,
highlight: tokens.blue.c200 highlight: tokens.blue.c200,
activeBackground: tokens.shade.c300,
}, },
global: { global: {

View File

@ -63,7 +63,9 @@ export default createTheme({
pill: { pill: {
background: tokens.shade.c300, background: tokens.shade.c300,
backgroundHover: tokens.shade.c200, backgroundHover: tokens.shade.c200,
highlight: tokens.blue.c200 highlight: tokens.blue.c200,
activeBackground: tokens.shade.c300,
}, },
global: { global: {