Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed ui with inputs color in workleap theme #806

Merged
merged 3 commits into from
May 9, 2024
Merged

fixed ui with inputs color in workleap theme #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1ffb7c
fixed ui with inputs color in workleap theme
fraincs May 8, 2024
da5f844
tagpicker focus style adjustment
fraincs May 8, 2024
dd0fecd
updated some situations where the style was not up to spec
fraincs May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .changeset/famous-ants-shout.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
"@igloo-ui/combobox": patch
"@igloo-ui/input": patch
"@igloo-ui/textarea": patch
"@igloo-ui/datepicker": patch
"@igloo-ui/form-group": patch
"@igloo-ui/select": patch
"@igloo-ui/tag-picker": patch
"@igloo-ui/text-editor": patch
---

UI fix for focused state
5 changes: 5 additions & 0 deletions .changeset/loud-dancers-jump.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@igloo-ui/tag-picker": patch
---

Added focus border color
1 change: 1 addition & 0 deletions packages/Combobox/src/Combobox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ const Combobox: React.FunctionComponent<ComboboxProps> = ({
const comboboxClassname = cx("ids-combobox", className, {
"ids-combobox--active": canShowMenu,
"ids-combobox--compact": isCompact,
"ids-combobox--search": search,
"ids-combobox--disabled": disabled,
"ids-combobox--error": error
});
Expand Down
6 changes: 3 additions & 3 deletions packages/Combobox/src/ComboboxInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ const ComboboxInput: React.FunctionComponent<ComboboxInputProps> = ({
const isWorkleap = getBrand() === "workleap";
const chevronClass = "ids-combobox-input__chevron";
const chevronUpIcon = isWorkleap ?
<AngleUpIcon className={chevronClass} size="sm" /> :
<AngleUpIcon className={chevronClass} size="sm" /> :
<ChevronUp className={chevronClass} size="small" />;
const chevronDownIcon = isWorkleap ?
<AngleDownIcon className={chevronClass} size="sm" /> :
const chevronDownIcon = isWorkleap ?
<AngleDownIcon className={chevronClass} size="sm" /> :
<ChevronDown className={chevronClass} size="small" />;

const handleChange = ({
Expand Down
10 changes: 8 additions & 2 deletions packages/Combobox/src/combobox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
--ids-combobox-background-focus: #{tokens.$samoyed};
--ids-combobox-focus: none;


/* Disabled */
--ids-combobox-color-disabled: #{tokens.$grey-500};
--ids-combobox-background-disabled: #{tokens.$grey-200};
Expand Down Expand Up @@ -76,6 +75,7 @@
/* Active */
--ids-combobox-background-active: var(--hop-neutral-surface);
--ids-combobox-border-color-active: var(--hop-neutral-border-active);
--ids-combobox-search-border-color-active: var(--hop-primary-border-focus);

/* Focus */
--ids-combobox-background-focus: var(--hop-neutral-surface-hover);
Expand Down Expand Up @@ -139,8 +139,8 @@
&:focus-visible,
&.focus {
background-color: var(--ids-combobox-background-focus);
box-shadow: var(--ids-combobox-focus);
border-color: var(--ids-combobox-border-color-focus);
box-shadow: var(--ids-combobox-focus);
}

&--active,
Expand All @@ -167,6 +167,7 @@
color: var(--ids-combobox-color-disabled);
background-color: var(--ids-combobox-background-disabled);
border-color: var(--ids-combobox-border-color-disabled);
box-shadow: none;
cursor: not-allowed;

&:hover {
Expand All @@ -180,6 +181,11 @@
}
}

.ids-combobox--search.ids-combobox--active,
.ids-combobox.active .ids-combobox--search {
border-color: var(--ids-combobox-search-border-color-active);
}

.ids-combobox__dropdown {
outline: none;
}
Expand Down
6 changes: 2 additions & 4 deletions packages/Input/src/input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,10 @@
--ids-input-background-hover: var(--hop-neutral-surface-hover);

/* Focus */
--ids-input-border-color-focus: var(--hop-neutral-border-hover);
--ids-input-focus: 0 0 0 0.12rem var(--hop-neutral-surface), 0 0 0 0.219rem var(--hop-primary-border-focus);
--ids-input-border-color-focus: var(--hop-primary-border-focus);

/* Active */
--ids-input-border-color-active: var(--hop-neutral-border-active);
--ids-input-border-color-active: var(--hop-primary-border-active);

/* disabled */
--ids-input-color-disabled: var(--hop-neutral-text-disabled);
Expand Down Expand Up @@ -275,7 +274,6 @@
outline: 0;
outline-offset: 0;
border: var(--ids-input-border-size) solid var(--ids-input-border-color-active);
box-shadow: var(--ids-input-focus, none);
}

.ids-input:active,
Expand Down
4 changes: 1 addition & 3 deletions packages/TagPicker/src/tag-picker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@
--ids-tag-picker-border-size: 0.0625rem;
--ids-tag-picker-border-color: var(--hop-neutral-border);
--ids-tag-picker-border-color-hover: var(--hop-neutral-border-hover);
--ids-tag-picker-border-color-focus: var(--hop-neutral-border-hover);
--ids-tag-picker-focus: 0 0 0 0.12rem var(--hop-neutral-surface), 0 0 0 0.219rem var(--hop-primary-border-focus);
--ids-tag-picker-border-color-focus: var(--hop-primary-border-focus);
--ids-tag-picker-border-color-error: var(--hop-danger-border-strong);
--ids-tag-picker-border-radius: var(--hop-shape-rounded-md);
--ids-tag-picker-font-family: var(--hop-body-md-font-family);
Expand Down Expand Up @@ -108,7 +107,6 @@

&--focused {
border-color: var(--ids-tag-picker-border-color-focus);
box-shadow: var(--ids-tag-picker-focus);
}

&--disabled {
Expand Down
3 changes: 1 addition & 2 deletions packages/TextEditor/src/text-editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@
--ids-text-editor-background-hover: var(--hop-neutral-surface-hover);

/* Focus */
--ids-text-editor-border-color-focus: var(--hop-neutral-border-active);
--ids-text-editor-focus: 0 0 0 0.12rem var(--hop-neutral-surface), 0 0 0 0.219rem var(--hop-primary-border-focus);
--ids-text-editor-border-color-focus: var(--hop-primary-border-active);

/* Disabled */
--ids-text-editor-background-disabled: var(--hop-neutral-surface-disabled);
Expand Down
3 changes: 1 addition & 2 deletions packages/Textarea/src/textarea.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@
--ids-textarea-color-placeholder: var(--hop-neutral-text-weakest);

/* Focus */
--ids-textarea-focus-border-color: var(--hop-neutral-border-active);
--ids-textarea-focus-box-shadow: 0 0 0 0.12rem var(--hop-neutral-surface), 0 0 0 0.219rem var(--hop-primary-border-focus);
--ids-textarea-focus-border-color: var(-hop-primary-border-focus);

/* Hover */
--ids-textarea-hover-border-color: var(--hop-neutral-border-hover);
Expand Down
Loading