Skip to content

Commit ed7c629

Browse files
committed
Småjusteringer
1 parent 53c7aa4 commit ed7c629

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/App.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import { applicationIntlMessages } from './i18n';
1010
import Søknad from './søknad/Søknad';
1111
import { SøknadRoutes } from './types/SøknadRoutes';
1212
import { appEnv } from './utils/appEnv';
13-
import '@navikt/ds-css';
14-
import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css';
1513
import './app.css';
1614

1715
const {
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* @tailwind base; */
2-
@import 'tailwindcss/utilities' layer(utilities);
1+
@import 'tailwindcss';
2+
@import '@navikt/ds-css' layer(components);
3+
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css' layer(utilities);
34

45
@config '../../tailwind.config.js';

apps/omsorgsdager-aleneomsorg-dialog/src/app/App.tsx

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Navigate, Route } from 'react-router-dom';
22
import { OmsorgsdagerAleneomsorgApp } from '@navikt/sif-app-register';
3+
import { isProd } from '@navikt/sif-common-env';
34
import {
45
ensureBaseNameForReactRouter,
56
SoknadApplication,
@@ -8,11 +9,8 @@ import {
89
import { applicationIntlMessages } from './i18n';
910
import Søknad from './søknad/Søknad';
1011
import { SøknadRoutes } from './types/SøknadRoutes';
11-
import '@navikt/ds-css';
12-
import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css';
13-
import './app.css';
1412
import { appEnv } from './utils/appEnv';
15-
import { isProd } from '@navikt/sif-common-env';
13+
import './app.css';
1614

1715
const {
1816
PUBLIC_PATH,
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* @tailwind base; */
2-
@import 'tailwindcss/utilities' layer(utilities);
1+
@import 'tailwindcss';
2+
@import '@navikt/ds-css' layer(components);
3+
@import '@navikt/sif-common-core-ds/src/styles/sif-ds-theme.css' layer(utilities);
34

45
@config '../../tailwind.config.cjs';

apps/omsorgsdager-kalkulator/styles/globals.css

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
color utility to any element that depends on these defaults.
1212
*/
1313
@layer base {
14-
*,
15-
::after,
16-
::before,
17-
::backdrop,
18-
::file-selector-button {
19-
border-color: var(--color-gray-200, currentColor);
20-
}
14+
*,
15+
::after,
16+
::before,
17+
::backdrop,
18+
::file-selector-button {
19+
border-color: var(--color-gray-200, currentColor);
20+
}
2121
}
2222

2323
html,

0 commit comments

Comments
 (0)