Skip to content

Commit

Permalink
fix[DSTSUP-86]: adjust select and combobox styles for core theme (#4145)
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahgm authored Sep 2, 2024
1 parent 21b1049 commit 340af20
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .changeset/spotty-tomatoes-cover.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@marigold/theme-core": patch
---

fix[DSTSUP-86]: adjust select and combobox styles for core theme
6 changes: 3 additions & 3 deletions themes/theme-core/src/components/ComboBox.styles.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ThemeComponent, cva } from '@marigold/system';

export const ComboBox: ThemeComponent<'ComboBox'> = cva(
'absolute right-2 size-4 border-none bg-transparent p-0 hover:bg-transparent'
);
export const ComboBox: ThemeComponent<'ComboBox'> = cva([
'absolute right-2 size-4 border-none p-0 bg-transparent disabled:bg-transparent hover:bg-transparent overflow-hidden',
]);
2 changes: 1 addition & 1 deletion themes/theme-core/src/components/Input.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export const inputHeight = 'h-component';
export const inputBox = 'border rounded-sm border-border-inverted bg-white';
export const inputSpacing = 'px-1';
export const inputDisabled =
'disabled:bg-bg-inverted-disabled disabled:border-border-base-disabled disabled:text-text-base-disabled';
'disabled:bg-bg-inverted-disabled disabled:border-border-base-disabled disabled:text-text-base-disabled disabled:cursor-not-allowed';

export const inputError = `data-[invalid]:border-border-error`;

Expand Down
10 changes: 9 additions & 1 deletion themes/theme-core/src/components/Select.styles.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import { ThemeComponent, cva } from '@marigold/system';
import { inputBox, inputHeight, inputSpacing } from './Input.styles';
import {
inputBox,
inputDisabled,
inputError,
inputHeight,
inputSpacing,
} from './Input.styles';

export const Select: ThemeComponent<'Select'> = {
icon: cva(),
select: cva([
inputBox,
inputHeight,
inputSpacing,
inputError,
inputDisabled,
'[&>[data-placeholder=true]]:text-text-inverted-disabled',
]),
};

0 comments on commit 340af20

Please sign in to comment.