Skip to content

Commit 53c7aa4

Browse files
frodehansen2frodehansen2
committed
Sette layers
1 parent 80ab96f commit 53c7aa4

File tree

23 files changed

+121
-86
lines changed

23 files changed

+121
-86
lines changed

‎apps/dine-pleiepenger/src/style/global.css

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import 'tailwindcss';
2-
@import '@navikt/ds-css' layer(base);
3-
@import '../components/page-layout/sak-page-header/sakPageHeader.css'
4-
layer(utilities);
2+
@import '@navikt/ds-css' layer(components);
3+
@import '../components/page-layout/sak-page-header/sakPageHeader.css' layer(utilities);
54

65
@config '../../tailwind.config.ts';
76

@@ -14,13 +13,13 @@
1413
color utility to any element that depends on these defaults.
1514
*/
1615
@layer base {
17-
*,
18-
::after,
19-
::before,
20-
::backdrop,
21-
::file-selector-button {
22-
border-color: var(--color-gray-200, currentColor);
23-
}
16+
*,
17+
::after,
18+
::before,
19+
::backdrop,
20+
::file-selector-button {
21+
border-color: var(--color-gray-200, currentColor);
22+
}
2423
}
2524

2625
.contentWrapper {

‎apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<meta charset="UTF-8" />
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<style>
9+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
</style>
811
<script type="text/json" id="nav:appSettings">
912
{{{APP_SETTINGS}}}
1013
</script>

‎apps/endringsmelding-pleiepenger/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<head>
55
<meta charset="UTF-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<style>
8+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
9+
</style>
710
<script type="text/json" id="nav:appSettings">
811
{{{APP_SETTINGS}}}
912
</script>

‎apps/omsorgsdager-aleneomsorg-dialog/e2e/server/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>Søknad om ekstra omsorgsdager ved aleneomsorg</title>
9+
<style>
10+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
11+
</style>
912
<script type="text/json" id="nav:appSettings">
1013
{{{APP_SETTINGS}}}
1114
</script>

‎apps/omsorgsdager-aleneomsorg-dialog/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>Søknad om ekstra omsorgsdager ved aleneomsorg</title>
9+
<style>
10+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
11+
</style>
912
<script type="text/json" id="nav:appSettings">
1013
{{{APP_SETTINGS}}}
1114
</script>

‎apps/omsorgspengerutbetaling-arbeidstaker-soknad/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<meta charset="UTF-8" />
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<style>
9+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
</style>
811
<script type="text/json" id="nav:appSettings">
912
{{{APP_SETTINGS}}}
1013
</script>

‎apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/app.css

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import 'tailwindcss';
2-
@import '@navikt/ds-css' layer(base);
3-
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css'
4-
layer(utilities);
2+
@import '@navikt/ds-css' layer(components);
3+
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css' layer(utilities);
54

65
@config '../../tailwind.config.js';
76

@@ -14,11 +13,11 @@
1413
color utility to any element that depends on these defaults.
1514
*/
1615
@layer base {
17-
*,
18-
::after,
19-
::before,
20-
::backdrop,
21-
::file-selector-button {
22-
border-color: var(--color-gray-200, currentColor);
23-
}
16+
*,
17+
::after,
18+
::before,
19+
::backdrop,
20+
::file-selector-button {
21+
border-color: var(--color-gray-200, currentColor);
22+
}
2423
}

‎apps/omsorgspengerutbetaling-soknad/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>Søknad om utbetaling av omsorgspenger til selvstendig næringsdrivende eller frilansere</title>
9+
<style>
10+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
11+
</style>
912
<script type="text/json" id="nav:appSettings">
1013
{{{APP_SETTINGS}}}
1114
</script>

‎apps/omsorgspengerutbetaling-soknad/src/app/app.css

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import 'tailwindcss';
2-
@import '@navikt/ds-css' layer(base);
3-
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css'
4-
layer(utilities);
2+
@import '@navikt/ds-css' layer(components);
3+
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css' layer(utilities);
54

65
@config '../../tailwind.config.cjs';
76

@@ -14,11 +13,11 @@
1413
color utility to any element that depends on these defaults.
1514
*/
1615
@layer base {
17-
*,
18-
::after,
19-
::before,
20-
::backdrop,
21-
::file-selector-button {
22-
border-color: var(--color-gray-200, currentColor);
23-
}
16+
*,
17+
::after,
18+
::before,
19+
::backdrop,
20+
::file-selector-button {
21+
border-color: var(--color-gray-200, currentColor);
22+
}
2423
}

‎apps/omsorgspengesoknad/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<meta charset="UTF-8" />
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<style>
9+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
</style>
811
<script type="text/json" id="nav:appSettings">
912
{{{APP_SETTINGS}}}
1013
</script>

‎apps/opplaringspenger-soknad/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<meta charset="UTF-8" />
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<style>
9+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
</style>
811
<script type="text/json" id="nav:appSettings">
912
{{{APP_SETTINGS}}}
1013
</script>

‎apps/opplaringspenger-soknad/src/app/app.css

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import 'tailwindcss';
2-
@import '@navikt/ds-css' layer(base);
3-
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css'
4-
layer(utilities);
2+
@import '@navikt/ds-css' layer(components);
3+
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css' layer(utilities);
54

65
@config '../../tailwind.config.js';
76

@@ -14,11 +13,11 @@
1413
color utility to any element that depends on these defaults.
1514
*/
1615
@layer base {
17-
*,
18-
::after,
19-
::before,
20-
::backdrop,
21-
::file-selector-button {
22-
border-color: var(--color-gray-200, currentColor);
23-
}
16+
*,
17+
::after,
18+
::before,
19+
::backdrop,
20+
::file-selector-button {
21+
border-color: var(--color-gray-200, currentColor);
22+
}
2423
}

‎apps/pleiepenger-i-livets-sluttfase-soknad/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<meta charset="UTF-8" />
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<style>
9+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
</style>
811
<script type="text/json" id="nav:appSettings">
912
{{{APP_SETTINGS}}}
1013
</script>

‎apps/pleiepenger-i-livets-sluttfase-soknad/src/app/app.css

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import 'tailwindcss';
2-
@import '@navikt/ds-css' layer(base);
3-
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css'
4-
layer(utilities);
2+
@import '@navikt/ds-css' layer(components);
3+
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css' layer(utilities);
54

65
@config '../../tailwind.config.cjs';
76

@@ -14,11 +13,11 @@
1413
color utility to any element that depends on these defaults.
1514
*/
1615
@layer base {
17-
*,
18-
::after,
19-
::before,
20-
::backdrop,
21-
::file-selector-button {
22-
border-color: var(--color-gray-200, currentColor);
23-
}
16+
*,
17+
::after,
18+
::before,
19+
::backdrop,
20+
::file-selector-button {
21+
border-color: var(--color-gray-200, currentColor);
22+
}
2423
}

‎apps/pleiepenger-sykt-barn/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<meta charset="UTF-8" />
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<style>
9+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
</style>
811
<script type="text/json" id="nav:appSettings">
912
{{{APP_SETTINGS}}}
1013
</script>

‎apps/pleiepenger-sykt-barn/src/app/app.css

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import 'tailwindcss';
2-
@import '@navikt/ds-css' layer(base);
3-
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css'
4-
layer(utilities);
2+
@import '@navikt/ds-css' layer(components);
3+
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css' layer(utilities);
54

65
@config '../../tailwind.config.cjs';
76

@@ -14,13 +13,13 @@
1413
color utility to any element that depends on these defaults.
1514
*/
1615
@layer base {
17-
*,
18-
::after,
19-
::before,
20-
::backdrop,
21-
::file-selector-button {
22-
border-color: var(--color-gray-200, currentColor);
23-
}
16+
*,
17+
::after,
18+
::before,
19+
::backdrop,
20+
::file-selector-button {
21+
border-color: var(--color-gray-200, currentColor);
22+
}
2423
}
2524

2625
.navds-guide-panel__content > .navds-body-long p:first-child {

‎apps/sif-demo-app/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>SIF DemoApp</title>
9+
<style>
10+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
11+
</style>
912
<script type="text/json" id="nav:appSettings">
1013
{{{APP_SETTINGS}}}
1114
</script>

‎apps/sif-ettersending/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<meta charset="UTF-8" />
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<style>
9+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
</style>
811
<script type="text/json" id="nav:appSettings">
912
{{{APP_SETTINGS}}}
1013
</script>

‎apps/sif-ettersending/src/app/app.css

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import 'tailwindcss';
2-
@import '@navikt/ds-css' layer(base);
2+
@import '@navikt/ds-css' layer(components);
33

44
@config '../../tailwind.config.cjs';
55

@@ -12,11 +12,11 @@
1212
color utility to any element that depends on these defaults.
1313
*/
1414
@layer base {
15-
*,
16-
::after,
17-
::before,
18-
::backdrop,
19-
::file-selector-button {
20-
border-color: var(--color-gray-200, currentColor);
21-
}
15+
*,
16+
::after,
17+
::before,
18+
::backdrop,
19+
::file-selector-button {
20+
border-color: var(--color-gray-200, currentColor);
21+
}
2222
}

‎apps/ungdomsytelse-deltaker/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>Søknad - ung</title>
9+
<style>
10+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
11+
</style>
912
<script type="text/json" id="nav:appSettings">
1013
{{{APP_SETTINGS}}}
1114
</script>

‎apps/ungdomsytelse-veileder/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<link rel="icon" type="image/svg+xml" href="/src/resources/favicon.svg" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>UNG-Veileder</title>
9+
<style>
10+
@layer base, dekorator-utilities, dekorator-base, components, utilities;
11+
</style>
912
<script type="text/json" id="nav:appSettings">
1013
{{{APP_SETTINGS}}}
1114
</script>

‎apps/ungdomsytelse-veileder/src/app.css

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import 'tailwindcss';
2-
@import '@navikt/ds-css' layer(base);
3-
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css'
4-
layer(utilities);
2+
@import '@navikt/ds-css' layer(components);
3+
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css' layer(utilities);
54
@import 'react-loading-skeleton/dist/skeleton.css' layer(utilities);
65

76
@config '../tailwind.config.ts';
@@ -15,13 +14,13 @@
1514
color utility to any element that depends on these defaults.
1615
*/
1716
@layer base {
18-
*,
19-
::after,
20-
::before,
21-
::backdrop,
22-
::file-selector-button {
23-
border-color: var(--color-gray-200, currentColor);
24-
}
17+
*,
18+
::after,
19+
::before,
20+
::backdrop,
21+
::file-selector-button {
22+
border-color: var(--color-gray-200, currentColor);
23+
}
2524
}
2625

2726
.page {

0 commit comments

Comments
 (0)