Skip to content

Commit cab0859

Browse files
frodehansen2frodehansen2
committed
Merge branch 'main' of github.com:navikt/sif-brukerdialog into ung
2 parents 80fe02f + 890afab commit cab0859

File tree

16 files changed

+17
-14
lines changed

16 files changed

+17
-14
lines changed

‎apps/dine-pleiepenger/src/pages/_document.page.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ class MyDocument extends Document<Props> {
6464
return (
6565
<Html lang={language || 'no'}>
6666
<Head>
67+
<style>@layer base, dekorator-utilities, dekorator-base, components, utilities;</style>
68+
6769
<Decorator.HeadAssets />
6870
<link
6971
rel="preload"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
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
<style>
9-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
9+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1010
</style>
1111
<script type="text/json" id="nav:appSettings">
1212
{{{APP_SETTINGS}}}

‎apps/endringsmelding-pleiepenger/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta charset="UTF-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<style>
8-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
8+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
99
</style>
1010
<script type="text/json" id="nav:appSettings">
1111
{{{APP_SETTINGS}}}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>Søknad om ekstra omsorgsdager ved aleneomsorg</title>
99
<style>
10-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1111
</style>
1212
<script type="text/json" id="nav:appSettings">
1313
{{{APP_SETTINGS}}}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>Søknad om ekstra omsorgsdager ved aleneomsorg</title>
99
<style>
10-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1111
</style>
1212
<script type="text/json" id="nav:appSettings">
1313
{{{APP_SETTINGS}}}

‎apps/omsorgsdager-kalkulator/pages/_document.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class MyDocument extends Document<Props> {
4141
const showDecorator = true;
4242
return (
4343
<Html lang={language || 'no'}>
44+
<style>@layer base, dekorator-utilities, dekorator-base, components, utilities;</style>
4445
<Head>{showDecorator && <Decorator.HeadAssets />}</Head>
4546
<body>
4647
{showDecorator && <Decorator.Header />}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
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
<style>
9-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
9+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1010
</style>
1111
<script type="text/json" id="nav:appSettings">
1212
{{{APP_SETTINGS}}}

‎apps/omsorgspengerutbetaling-soknad/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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>
99
<style>
10-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1111
</style>
1212
<script type="text/json" id="nav:appSettings">
1313
{{{APP_SETTINGS}}}

‎apps/omsorgspengesoknad/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
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
<style>
9-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
9+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1010
</style>
1111
<script type="text/json" id="nav:appSettings">
1212
{{{APP_SETTINGS}}}

‎apps/opplaringspenger-soknad/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
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
<style>
9-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
9+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1010
</style>
1111
<script type="text/json" id="nav:appSettings">
1212
{{{APP_SETTINGS}}}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
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
<style>
9-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
9+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1010
</style>
1111
<script type="text/json" id="nav:appSettings">
1212
{{{APP_SETTINGS}}}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
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
<style>
9-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
9+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1010
</style>
1111
<script type="text/json" id="nav:appSettings">
1212
{{{APP_SETTINGS}}}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>SIF DemoApp</title>
99
<style>
10-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1111
</style>
1212
<script type="text/json" id="nav:appSettings">
1313
{{{APP_SETTINGS}}}

‎apps/sif-ettersending/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
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
<style>
9-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
9+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1010
</style>
1111
<script type="text/json" id="nav:appSettings">
1212
{{{APP_SETTINGS}}}

‎apps/ungdomsytelse-deltaker/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>Søknad - ung</title>
99
<style>
10-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1111
</style>
1212
<script type="text/json" id="nav:appSettings">
1313
{{{APP_SETTINGS}}}

‎apps/ungdomsytelse-veileder/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>UNG-Veileder</title>
99
<style>
10-
@layer base, dekorator-utilities, dekorator-base, components, utilities;
10+
@layer base, dekorator-utilities, dekorator-base, utilities, components;
1111
</style>
1212
<script type="text/json" id="nav:appSettings">
1313
{{{APP_SETTINGS}}}

0 commit comments

Comments
 (0)