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

[Darkside] Quality assurance P1 #3510

Merged
merged 9 commits into from
Jan 22, 2025
+54 −68
Merged

[Darkside] Quality assurance P1 #3510

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ed31a9b
:lipstick: Adjustments 1
KenAJoh Jan 20, 2025
d95086d
:lipstick: Bumped default strong scale
KenAJoh Jan 20, 2025
68cd45e
:lipstick: Bumped secondary neutral border
KenAJoh Jan 20, 2025
1689d77
:lipstick: Reduced text-color change on hover
KenAJoh Jan 20, 2025
106deb3
:bug: Resolved border and focus logic for combobox
KenAJoh Jan 20, 2025
87b02f4
:bug: Fix icon sizing for buttons
KenAJoh Jan 20, 2025
1ed5eb7
:lipstick: Use tertiary-buttons for datepicker caption
KenAJoh Jan 21, 2025
a3cb1b8
Update @navikt/core/react/src/chips/Toggle.tsx
KenAJoh Jan 22, 2025
1252325
:lipstick: QA updates combobox darkside (#3511)
KenAJoh Jan 22, 2025
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
2 changes: 1 addition & 1 deletion @navikt/core/css/darkside/accordion.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
height: 22px;
align-self: center;
background-color: var(--ax-bg-accent-moderateA);
color: var(--ax-text-accent-strong);
color: var(--ax-text-accent);
}

.navds-accordion__header-chevron {
Expand Down
2 changes: 1 addition & 1 deletion @navikt/core/css/darkside/action-menu.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@

&:focus {
background-color: var(--ax-bg-danger-moderate-hoverA);
color: var(--ax-text-danger-strong);
color: var(--ax-text-danger);
}
}

Expand Down
12 changes: 7 additions & 5 deletions @navikt/core/css/darkside/button.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,28 @@
box-shadow: inset 0 0 0 var(--__axc-button-border-width) var(--__axc-button-border-color);

&:focus-visible {
outline: 2px solid var(--ax-border-focus);
outline-offset: 2px;
Comment on lines -20 to -21
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is part of a new test for focus-markings. I will create a separate PR for all the other components updating this.

outline: 3px solid var(--ax-border-focus);
outline-offset: 3px;
}
}

.navds-button--small,
.navds-button--xsmall {
--__axc-button-icon-margin: -2px;
--__axc-button-icon-size: 1.25rem;
}

.navds-button--small {
padding: var(--ax-space-4) var(--ax-space-12);
min-height: 2rem;
min-width: 2rem;
gap: var(--ax-space-6);
}

.navds-button--xsmall {
padding: var(--ax-space-2) var(--ax-space-8);
gap: var(--ax-space-4);

--__axc-button-icon-size: 1.25rem;
}

.navds-button--icon-only {
Expand Down Expand Up @@ -159,7 +161,7 @@
* .navds-button--secondary-neutral *
**************************/
.navds-button--secondary-neutral {
--__axc-button-border-color: var(--ax-border-default);
--__axc-button-border-color: var(--ax-border-strong);

background-color: transparent;
color: var(--ax-text-default);
Expand All @@ -178,7 +180,7 @@
}

&:is(:disabled, .navds-button--disabled) {
--__axc-button-border-color: var(--ax-border-default);
--__axc-button-border-color: var(--ax-border-strong);

color: var(--ax-text-default);
background-color: transparent;
Expand Down
2 changes: 1 addition & 1 deletion @navikt/core/css/darkside/chat.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
.navds-chat--neutral {
& .navds-chat__bubble,
& .navds-chat__avatar {
background-color: var(--ax-bg-moderate);
background-color: var(--ax-bg-moderateA);
}
}

Expand Down
2 changes: 1 addition & 1 deletion @navikt/core/css/darkside/chips.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
.navds-chips__toggle--action {
box-shadow: inset 0 0 0 1px var(--ax-border-accent-subtleA);
background-color: var(--ax-bg-accent-moderate);
color: var(--ax-text-default);
color: var(--ax-text-accent-strong);

&:hover {
background-color: var(--ax-bg-accent-moderate-hover);
Expand Down
35 changes: 3 additions & 32 deletions @navikt/core/css/darkside/copybutton.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,8 @@
--__axc-copybutton-padding: var(--ax-space-4);
}

& .navds-copybutton__icon {
font-size: 1.25rem;
}

& > .navds-copybutton__content {
gap: var(--ax-space-6);
gap: var(--ax-space-4);
}
}

Expand All @@ -96,26 +92,14 @@
}

& > .navds-copybutton__content {
gap: var(--ax-space-4);
gap: var(--ax-space-2);
}
}

/* ----------------------------- CopyButton Icon ---------------------------- */
.navds-copybutton__icon {
font-size: 1.5rem;
display: flex;

&:first-of-type {
margin-left: -0.25rem;
}

&:last-of-type {
margin-right: -0.25rem;
}

&:only-child {
margin: 0;
}
}

.navds-copybutton--active .navds-copybutton__icon {
Expand Down Expand Up @@ -146,14 +130,6 @@

&.navds-copybutton--active {
color: var(--ax-text-success);

&:hover {
color: var(--ax-text-success-strong);
}
}

&:hover {
color: var(--ax-text-accent-strong);
}

&:disabled {
Expand All @@ -165,11 +141,6 @@
.navds-copybutton--neutral {
color: var(--ax-text-subtle);

&:hover,
&.navds-copybutton--active {
color: var(--ax-text-default);
}

&:disabled {
color: var(--ax-text-subtle);
}
Expand All @@ -179,5 +150,5 @@
display: inline-flex;
align-items: center;
justify-content: center;
gap: var(--ax-space-8);
gap: var(--ax-space-6);
}
26 changes: 17 additions & 9 deletions @navikt/core/css/darkside/form/combobox.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

.navds-form-field:not(:is(.navds-combobox--disabled, .navds-combobox--readonly)) {
& .navds-combobox__wrapper:hover {
border-color: var(--ax-border-focus);
border-color: var(--ax-border-accent-strong);
}
}

Expand All @@ -31,6 +31,10 @@
opacity: var(--ax-opacity-disabled);

& .navds-combobox__wrapper {
&:hover {
border-color: var(--ax-border-default);
}

& *:hover {
cursor: not-allowed;
}
Expand Down Expand Up @@ -80,9 +84,9 @@
border-radius: var(--ax-border-radius-medium);

&:has(.navds-combobox__input:focus-visible) {
outline: 2px solid var(--ax-border-focus);
outline-offset: 2px;
border-color: var(--ax-border-focus);
outline: 3px solid var(--ax-border-focus);
outline-offset: 3px;
border-color: var(--ax-border-accent-strong);
}

&:has(.navds-combobox__input:focus-visible).navds-combobox__wrapper-inner--virtually-unfocused {
Expand Down Expand Up @@ -113,15 +117,19 @@
&:hover {
cursor: text;
}

.navds-combobox--disabled &:hover {
border-color: var(--ax-border-default);
}
}

.navds-combobox--error {
& .navds-combobox__wrapper-inner {
border-color: var(--ax-border-danger);
box-shadow: 0 0 0 1px var(--ax-border-danger);
border-color: var(--ax-border-danger-strong);
box-shadow: 0 0 0 1px var(--ax-border-danger-strong);

&:has(.navds-combobox__input:focus-visible) {
border-color: var(--ax-border-danger);
border-color: var(--ax-border-danger-strong);
}
}
}
Expand Down Expand Up @@ -230,7 +238,7 @@
/* dropdown & non selectable dropdown items */

.navds-combobox__list {
max-height: 290px;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This size is a little arbitrary, but helps a little with this issue: #3498. By adjusting the height, you will by default see part of the last item before scrolling.

max-height: 316px;
overflow: clip;
position: absolute;
left: 0;
Expand Down Expand Up @@ -324,7 +332,7 @@
}

& svg {
color: var(--ax-text-accent);
color: var(--ax-text-default);
}
}

Expand Down
2 changes: 1 addition & 1 deletion @navikt/core/css/darkside/form/radio-checkbox.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@

.navds-checkbox__input:hover:not(:disabled) + .navds-checkbox__label,
.navds-radio__input:hover:not(:disabled) + .navds-radio__label {
color: var(--ax-text-accent-strong);
color: var(--ax-text-accent);
}

.navds-checkbox__input:hover:not(:disabled, :checked, :indeterminate) + .navds-checkbox__label::before,
Expand Down
4 changes: 2 additions & 2 deletions @navikt/core/css/darkside/form/switch.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

.navds-switch__input:hover ~ .navds-switch__label-wrapper,
.navds-switch__label-wrapper:hover {
color: var(--ax-text-accent-strong);
color: var(--ax-text-accent);
}

.navds-switch__input:disabled:hover ~ .navds-switch__label-wrapper {
Expand Down Expand Up @@ -124,7 +124,7 @@
.navds-switch__input:checked ~ .navds-switch__track > & {
background-color: var(--ax-bg-raised);
transform: translateX(1.25rem);
color: var(--ax-text-accent-strong);
color: var(--ax-text-accent);
width: 1.25rem;
height: 1.25rem;
left: 0;
Expand Down
4 changes: 2 additions & 2 deletions @navikt/core/css/darkside/read-more.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
text-align: start;

&:focus-visible {
outline: 2px solid var(--ax-border-focus);
outline-offset: 2px;
outline: 3px solid var(--ax-border-focus);
outline-offset: 3px;
}

&[data-state="open"] .navds-read-more__expand-icon {
Expand Down
7 changes: 6 additions & 1 deletion @navikt/core/react/src/chips/Toggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,12 @@ export const ToggleChips: OverridableComponent<
fillRule="evenodd"
clipRule="evenodd"
d="M10 3.125C6.20304 3.125 3.125 6.20304 3.125 10C3.125 13.797 6.20304 16.875 10 16.875C13.797 16.875 16.875 13.797 16.875 10C16.875 6.20304 13.797 3.125 10 3.125ZM1.875 10C1.875 5.51269 5.51269 1.875 10 1.875C14.4873 1.875 18.125 5.51269 18.125 10C18.125 14.4873 14.4873 18.125 10 18.125C5.51269 18.125 1.875 14.4873 1.875 10Z"
fill="var(--ax-text-neutral-icon, var(--ac-chip-toggle-circle-border, var(--a-border-default)))"
/* After removing old fallbacks, change to currentColor */
fill={`var(${
KenAJoh marked this conversation as resolved.
Show resolved Hide resolved
variant === "action"
? "--ax-text-accent-strong"
: "--ax-text-default"
}, var(--ac-chip-toggle-circle-border, var(--a-border-default)))`}
/>
)}
</svg>
Expand Down
4 changes: 2 additions & 2 deletions @navikt/core/react/src/date/datepicker/parts/Caption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const DatePickerCaption = ({ displayMonth, id }: CaptionProps) => {
<>
<div className="navds-date__caption">
<Button
variant="tertiary"
variant="tertiary-neutral"
disabled={!previousMonth}
onClick={() => previousMonth && goToMonth(previousMonth)}
icon={<ArrowLeftIcon title={translate("goToPreviousMonth")} />}
Expand All @@ -41,7 +41,7 @@ export const DatePickerCaption = ({ displayMonth, id }: CaptionProps) => {
icon={<ArrowRightIcon title={translate("goToNextMonth")} />}
onClick={() => nextMonth && goToMonth(nextMonth)}
disabled={!nextMonth}
variant="tertiary"
variant="tertiary-neutral"
className="navds-date__caption-button"
type="button"
/>
Expand Down
4 changes: 2 additions & 2 deletions @navikt/core/react/src/date/datepicker/parts/DropdownCaption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const DropdownCaption = ({ displayMonth, id }: CaptionProps) => {
{formatCaption(displayMonth, { locale })}
</span>
<Button
variant="tertiary"
variant="tertiary-neutral"
disabled={!previousMonth}
onClick={() => previousMonth && goToMonth(previousMonth)}
icon={<ArrowLeftIcon title={translate("goToPreviousMonth")} />}
Expand Down Expand Up @@ -94,10 +94,10 @@ export const DropdownCaption = ({ displayMonth, id }: CaptionProps) => {
</div>

<Button
variant="tertiary-neutral"
icon={<ArrowRightIcon title={translate("goToNextMonth")} />}
onClick={() => nextMonth && goToMonth(nextMonth)}
disabled={!nextMonth}
variant="tertiary"
className="navds-date__caption-button"
type="button"
/>
Expand Down
8 changes: 4 additions & 4 deletions @navikt/core/tokens/darkside/tokens/semantic.ts
View file
Open in desktop
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are testing using a little darker "default"-scale for strong. This makes primary-neutral buttons, ToggleGroup, Tag etc more defined and visually equal to the counterparts with "role"

Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,17 @@ export function semanticTokenConfig(theme: ColorTheme) {
group: `background`,
},
strong: {
value: `{ax.neutral.600.value}`,
value: `{ax.neutral.700.value}`,
type: "color",
group: `background`,
},
"strong-hover": {
value: `{ax.neutral.700.value}`,
value: `{ax.neutral.800.value}`,
type: "color",
group: `background`,
},
"strong-pressed": {
value: `{ax.neutral.800.value}`,
value: `{ax.neutral.900.value}`,
type: "color",
group: `background`,
},
Expand Down Expand Up @@ -160,7 +160,7 @@ export function semanticTokenConfig(theme: ColorTheme) {
* - Discuss with brand
*/
focus: {
value: "{ax.accent.700.value}",
value: "{ax.neutral.1000.value}",
type: "color",
group: "border",
/**
Expand Down
Loading