Skip to content

Commit 6ef57ee

Browse files
authored
[FIX] Fikset Select issue ved bruk i Intern-header (navikt#1616)
1 parent dd2167d commit 6ef57ee

File tree

6 files changed

+33
-13
lines changed

6 files changed

+33
-13
lines changed

.storybook/preview.js

+26-6
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,33 @@ export const parameters = {
2121
value: "#ffffff",
2222
},
2323
{
24-
name: "Alternate",
25-
value: "#f7f7f7",
26-
},
27-
{
28-
name: "Inverted",
29-
value: "#292929",
24+
name: "Darkmode",
25+
value: "#262626",
3026
},
3127
],
3228
},
3329
};
30+
31+
export const globalTypes = {
32+
theme: {
33+
name: "Theme",
34+
description: "Global theme for components",
35+
defaultValue: "light",
36+
toolbar: {
37+
icon: "circlehollow",
38+
items: [
39+
{ value: "light", icon: "circlehollow", title: "light" },
40+
{ value: "dark", icon: "circle", title: "dark" },
41+
],
42+
showName: true,
43+
},
44+
},
45+
};
46+
47+
export const withTheme = (StoryFn, context) => (
48+
<div data-theme={context.parameters.theme || context.globals.theme}>
49+
<StoryFn />
50+
</div>
51+
);
52+
53+
export const decorators = [withTheme];

.storybook/theme.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default create({
99
fontCode: "monospace",
1010

1111
// Text colors
12-
textColor: "#292929",
12+
textColor: "#262626",
1313
textInverseColor: "rgba(255,255,255,0.9)",
1414

1515
colorSecondary: "rgba(0, 36, 58, 1)",

@navikt/core/css/form/select.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
--navds-select-color-background-disabled: var(
1717
--navds-semantic-color-component-background-alternate
1818
);
19-
--navds-select-color-text-disabled: var(--navds-semantic-color-text);
2019
}
2120

2221
.navds-select__input {
@@ -47,6 +46,7 @@
4746
display: flex;
4847
width: 100%;
4948
align-items: center;
49+
color: var(--navds-semantic-color-text);
5050
}
5151

5252
.navds-select__chevron {

@navikt/core/react/src/loader/loader.stories.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const Variant = () => (
5555
<Loader size="3xlarge" variant="inverted" />
5656
<Loader size="3xlarge" variant="interaction" />
5757
</div>
58-
<div style={{ backgroundColor: "#292929" }}>
58+
<div style={{ backgroundColor: "#262626" }}>
5959
<Loader size="3xlarge" variant="neutral" />
6060
<Loader size="3xlarge" variant="inverted" />
6161
<Loader size="3xlarge" variant="interaction" />
@@ -70,7 +70,7 @@ export const Transparent = () => (
7070
<Loader size="3xlarge" transparent variant="inverted" />
7171
<Loader size="3xlarge" transparent variant="interaction" />
7272
</div>
73-
<div style={{ backgroundColor: "#292929" }}>
73+
<div style={{ backgroundColor: "#262626" }}>
7474
<Loader size="3xlarge" transparent variant="neutral" />
7575
<Loader size="3xlarge" transparent variant="inverted" />
7676
<Loader size="3xlarge" transparent variant="interaction" />

@navikt/core/tokens/stories/border-radius.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const Border = ({ token }) => (
1313
width: 4rem;
1414
height: 4rem;
1515
background: #f7f7f7;
16-
border: 2px solid #292929;
16+
border: 2px solid #262626;
1717
}
1818
`}</style>
1919
</>

yarn.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -3222,7 +3222,7 @@ __metadata:
32223222
resolution: "@navikt/ds-react-internal@workspace:@navikt/internal/react"
32233223
dependencies:
32243224
"@navikt/ds-icons": ^0.8.20
3225-
"@navikt/ds-react": ^0.19.26
3225+
"@navikt/ds-react": ^0.19.27
32263226
"@popperjs/core": ^2.10.1
32273227
"@types/node": ^17.0.35
32283228
classnames: ^2.3.1
@@ -3238,7 +3238,7 @@ __metadata:
32383238
languageName: unknown
32393239
linkType: soft
32403240

3241-
"@navikt/ds-react@*, @navikt/ds-react@^0.19.26, @navikt/ds-react@workspace:@navikt/core/react":
3241+
"@navikt/ds-react@*, @navikt/ds-react@^0.19.27, @navikt/ds-react@workspace:@navikt/core/react":
32423242
version: 0.0.0-use.local
32433243
resolution: "@navikt/ds-react@workspace:@navikt/core/react"
32443244
dependencies:

0 commit comments

Comments
 (0)