Skip to content

Commit be24dbc

Browse files
committed
FO-2882 Bedre responsivitet på tabellen
1 parent 2a272b6 commit be24dbc

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

src/components/user-table/body/user-table-body.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import "~nav-frontend-core/less/_variabler";
2+
@import "../user-table";
23

34
.user-table-body {
45
padding: 0;
@@ -19,7 +20,7 @@
1920

2021
&__innhold {
2122
display: grid;
22-
grid-template-columns: 2.5fr repeat(2, 2fr) 3fr repeat(3, 2fr) 1fr;
23+
.column-template();
2324
justify-items: start;
2425
padding: 1.5rem 2rem;
2526
cursor: pointer;

src/components/user-table/body/user-table-row.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import React, { CSSProperties } from 'react';
22
import cls from 'classnames';
33
import { Bruker, UtkastStatus } from '../../../rest/data/bruker';
44
import { formatDateStr, formatDateTime } from '../../../utils/date-utils';
@@ -28,15 +28,17 @@ export const UserRow = (props: { bruker: Bruker, aktivEnhet: OrNothing<string> }
2828
return undefined;
2929
}
3030

31+
const alignStart: CSSProperties = { textAlign: 'start' };
32+
3133
return (
3234
<li className="user-table-row">
3335
<a className={cls('user-table-row__innhold', {'user-table-row__innhold--maskert': erMaskert})} href={lagBrukerUrl()}>
34-
<Normaltekst style={{ textAlign: 'start' }}>{lagBrukerNavn(brukerFornavn, brukerEtternavn)}</Normaltekst>
36+
<Normaltekst style={alignStart}>{lagBrukerNavn(brukerFornavn, brukerEtternavn)}</Normaltekst>
3537
<Element>{brukerFnr}</Element>
3638
<Normaltekst>{formatDateStr(vedtakStartet)}</Normaltekst>
3739
<UtkastStatusData status={status}/>
38-
<Element>{beslutterNavn || '-'}</Element>
39-
<Normaltekst>{veilederNavn}</Normaltekst>
40+
<Element style={alignStart}>{beslutterNavn || '-'}</Element>
41+
<Normaltekst style={alignStart}>{veilederNavn}</Normaltekst>
4042
<Normaltekst>{formatDateTime(statusEndret)}</Normaltekst>
4143
<Normaltekst>{fjernNavFraEnhetNavn(brukerOppfolgingsenhetNavn)}</Normaltekst>
4244
</a>

src/components/user-table/header/user-table-header.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
@import "~nav-frontend-core/less/_variabler";
2+
@import "../user-table";
23

34
.user-table-header {
45
display: grid;
5-
grid-template-columns: 2.5fr repeat(2, 2fr) 3fr repeat(3, 2fr) 1fr;
6+
.column-template();
67
justify-items: start;
78
padding: 0 2rem 1rem 2rem;
89
border-bottom: 2px solid @navGra60;

src/components/user-table/user-table.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,9 @@
77
margin: 2rem auto 0 auto;
88
width: 400px;
99
}
10+
}
11+
12+
.column-template() {
13+
grid-template-columns: minmax(150px, 2fr) minmax(120px, 150px) minmax(100px, 150px) minmax(125px, 250px) minmax(100px, 2fr) minmax(100px, 2fr) minmax(100px, 200px) minmax(75px, 150px);
14+
grid-column-gap: 4px;
1015
}

0 commit comments

Comments
 (0)