-
Notifications
You must be signed in to change notification settings - Fork 42
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.
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
+54
−68
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
ed31a9b
:lipstick: Adjustments 1
KenAJoh d95086d
:lipstick: Bumped default strong scale
KenAJoh 68cd45e
:lipstick: Bumped secondary neutral border
KenAJoh 1689d77
:lipstick: Reduced text-color change on hover
KenAJoh 106deb3
:bug: Resolved border and focus logic for combobox
KenAJoh 87b02f4
:bug: Fix icon sizing for buttons
KenAJoh 1ed5eb7
:lipstick: Use tertiary-buttons for datepicker caption
KenAJoh a3cb1b8
Update @navikt/core/react/src/chips/Toggle.tsx
KenAJoh 1252325
:lipstick: QA updates combobox darkside (#3511)
KenAJoh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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); | ||
} | ||
} | ||
|
||
|
@@ -31,6 +31,10 @@ | |
opacity: var(--ax-opacity-disabled); | ||
|
||
& .navds-combobox__wrapper { | ||
&:hover { | ||
border-color: var(--ax-border-default); | ||
} | ||
|
||
& *:hover { | ||
cursor: not-allowed; | ||
} | ||
|
@@ -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 { | ||
|
@@ -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); | ||
} | ||
} | ||
} | ||
|
@@ -230,7 +238,7 @@ | |
/* dropdown & non selectable dropdown items */ | ||
|
||
.navds-combobox__list { | ||
max-height: 290px; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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; | ||
|
@@ -268,7 +276,7 @@ | |
border-radius: var(--ax-border-radius-medium); | ||
border: 0; | ||
margin-inline: var(--ax-space-8); | ||
margin-block: var(--ax-space-4); | ||
margin-block: var(--ax-space-2); | ||
scroll-margin-block: 8px; /* outline + outline-offset + margin-block */ | ||
} | ||
|
||
|
@@ -307,7 +315,6 @@ | |
.navds-combobox__list-item--focus { | ||
cursor: pointer; | ||
outline: 2px solid var(--ax-border-focus); | ||
outline-offset: 2px; | ||
} | ||
|
||
.navds-combobox__list-item { | ||
|
@@ -321,10 +328,11 @@ | |
& mark { | ||
background-color: transparent; | ||
font-weight: var(--ax-font-weight-bold); | ||
color: var(--ax-text-default); | ||
} | ||
|
||
& svg { | ||
color: var(--ax-text-accent); | ||
color: var(--ax-text-default); | ||
} | ||
} | ||
|
||
|
@@ -344,14 +352,14 @@ | |
justify-content: flex-start; | ||
gap: 0.25rem; | ||
margin: 0; | ||
margin-block: calc(var(--ax-space-4) * -1); | ||
padding-block: var(--ax-space-16); | ||
margin-block-start: calc(var(--ax-space-4) * -1); | ||
|
||
& svg { | ||
color: var(--ax-text-default); | ||
} | ||
|
||
&:only-child { | ||
margin-block: calc(var(--ax-space-4) * -1); | ||
border: none; | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.