Skip to content

Commit cec0aa3

Browse files
committed
FO-2760 La til header
1 parent db85166 commit cec0aa3

File tree

8 files changed

+59
-15
lines changed

8 files changed

+59
-15
lines changed

package-lock.json

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@
3939
"constate": "^1.3.2",
4040
"craco-less": "1.9.0",
4141
"dayjs": "^1.8.17",
42-
"react": "^16.12.0",
42+
"nav-frontend-core": "^4.0.11",
43+
"nav-frontend-typografi": "^2.0.17",
44+
"nav-frontend-typografi-style": "^1.0.18",
45+
"prop-types": "^15.7.2",
46+
"react": "^16.13.0",
4347
"react-dom": "^16.11.0",
4448
"react-scripts": "3.0.1",
4549
"typescript": "3.4.5"

src/app.less

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/app.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
import React from 'react';
22
import { DataFetcher } from './components/datafetcher';
33
import StoreProvider from './stores/store-provider';
4-
import './app.less';
4+
import { Header } from './components/header/header';
55

66
function App() {
77
return (
8-
<main>
9-
<StoreProvider>
8+
<StoreProvider>
9+
<Header />
10+
<main>
1011
<DataFetcher>
11-
<p>Hello world</p>
12+
<p />
1213
</DataFetcher>
13-
</StoreProvider>
14-
</main>
14+
</main>
15+
</StoreProvider>
1516
);
1617
}
1718

src/components/header/header.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
.header {
3+
width: 100%;
4+
padding: 2rem;
5+
background-color: white;
6+
}

src/components/header/header.tsx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import React from 'react';
2+
import { Sidetittel } from 'nav-frontend-typografi';
3+
import './header.less';
4+
5+
export const Header = () => {
6+
return (
7+
<div className="header">
8+
<Sidetittel>Beslutteroversikt</Sidetittel>
9+
</div>
10+
);
11+
};

src/index.less

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.beslutteroversikt {
2+
> * {
3+
box-sizing: border-box;
4+
}
5+
6+
background-color: #f4f4f4;
7+
}
8+
9+
body {
10+
margin: 0;
11+
}

src/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import App from './app';
44
import env from './utils/environment';
55
import * as dayjs from 'dayjs';
66
import 'dayjs/locale/nb';
7+
import './index.less';
78

89
dayjs.locale('nb');
910

0 commit comments

Comments
 (0)