Skip to content

Commit 0f54406

Browse files
klaramargrethehelgemo[Klara Margrethe Helgemo]
andauthored
Tk38 forbedringer kvalitetssikring 14a (#41)
* TK-38 Forbedringer kvalitetssikring-14a. Nye ikoner, overskrift tar mindre plass, midtstilling av innhold når skjermstørrelse er over maks bredde. * TK-38 Forbedringer kvalitetssikring-14a. Har fjernet Filters, samt .less-filene for bruker-filter og status-dropdown. Styling lagt inn i filters.less. Tittel har nå samme venstre marg som tabellen. Feilretting som etterspurt i PR. * TK-38 Forbedringer kvalitetssikring-14a. Har fjernet Filters, samt .less-filene for bruker-filter og status-dropdown. Styling lagt inn i filters.less. Tittel har nå samme venstre marg som tabellen. Feilretting som etterspurt i PR. 26.08: Styling ikoner plassert i .less-fil Co-authored-by: [Klara Margrethe Helgemo] <[[email protected]]>
1 parent 390a1df commit 0f54406

File tree

5 files changed

+61
-60
lines changed

5 files changed

+61
-60
lines changed

src/components/header/header.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.header {
22
background-color: white;
33
display: grid;
4-
grid-template-columns: 30% 15% 5% 20%;
4+
grid-template-columns: minmax(150px, 400px) minmax(120px, 150px) minmax(50px, 50px) minmax(135px, 250px);
55
align-items: center;
66
padding: 0.5rem 2rem 1rem 2rem;
77
margin-bottom: 1rem;
Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,64 @@
1-
@import "~nav-frontend-core/less/_variabler";
2-
@import "../user-table";
1+
@import '~nav-frontend-core/less/_variabler';
2+
@import '../user-table';
33

44
.user-table-body {
5-
padding: 0;
6-
margin: 0;
7-
border: 1px solid @navLysGra;
5+
padding: 0;
6+
margin: 0;
7+
border: 1px solid @navLysGra;
88

9-
.user-table-row:nth-child(even) {
10-
background-color: white;
11-
}
9+
.user-table-row:nth-child(even) {
10+
background-color: white;
11+
}
1212

13-
.user-table-row:nth-child(odd) {
14-
background-color: #f7f7f7;
15-
}
13+
.user-table-row:nth-child(odd) {
14+
background-color: #f7f7f7;
15+
}
1616
}
1717

1818
.user-table-row {
19-
display: block;
20-
21-
&__innhold {
22-
display: grid;
23-
.column-template();
24-
justify-items: start;
25-
padding: 1rem 2rem;
26-
cursor: pointer;
27-
text-align: center;
28-
align-items: end;
29-
color: @navMorkGra;
30-
text-decoration: none;
31-
}
32-
33-
&__innhold--maskert {
34-
cursor: not-allowed;
35-
}
36-
37-
&:hover {
38-
position: relative;
39-
z-index: 1;
40-
41-
box-shadow: 0 5px 5px fade(@navGra20, 60%), 0 -5px 5px fade(@navGra20, 60%);
42-
}
43-
44-
.status {
45-
display: grid;
46-
grid-template-columns: 2rem auto;
47-
align-items: center;
48-
49-
.status_ikon {
50-
max-width: 26px;
51-
&__bla{
52-
stroke: @navLysBlaDarken40;
53-
}
54-
&__oransje{
55-
stroke: @navOransjeDarken20;
56-
}
57-
&__default{
58-
stroke: @navMorkGra;
59-
}
60-
}
61-
}
19+
display: block;
6220

21+
&__innhold {
22+
display: grid;
23+
.column-template();
24+
justify-items: start;
25+
padding: 1rem 2rem;
26+
cursor: pointer;
27+
text-align: center;
28+
align-items: end;
29+
color: @navMorkGra;
30+
text-decoration: none;
31+
}
32+
33+
&__innhold--maskert {
34+
cursor: not-allowed;
35+
}
36+
37+
&:hover {
38+
position: relative;
39+
z-index: 1;
40+
41+
box-shadow: 0 5px 5px fade(@navGra20, 60%), 0 -5px 5px fade(@navGra20, 60%);
42+
}
43+
44+
.status {
45+
display: grid;
46+
grid-template-columns: 2rem auto;
47+
align-items: center;
48+
text-align: left;
49+
50+
.status_ikon {
51+
max-width: 26px;
52+
font-size: 1.5rem;
53+
&__bla {
54+
color: @navLysBlaDarken40;
55+
}
56+
&__oransje {
57+
color: @navOransjeDarken20;
58+
}
59+
&__default {
60+
color: @navGra80;
61+
}
62+
}
63+
}
6364
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export const UserRow = (props: { idx: number; bruker: Bruker; aktivEnhet: OrNoth
4242
href={lagBrukerUrl()}
4343
>
4444
<Normaltekst tag="span" role="cell" style={alignStart}>
45-
{lagBrukerNavn(brukerFornavn, brukerEtternavn)}
45+
{lagBrukerNavn(brukerEtternavn, brukerFornavn)}
4646
</Normaltekst>
4747
<Element tag="span" role="cell">
4848
{brukerFnr}
@@ -76,7 +76,7 @@ const UtkastStatusData = (props: { status: UtkastStatus }) => {
7676
switch (props.status) {
7777
case UtkastStatus.TRENGER_BESLUTTER:
7878
StatusIkon = AddPeople;
79-
ikonFarge = '';
79+
ikonFarge = 'status_ikon__default';
8080
break;
8181
case UtkastStatus.KLAR_TIL_BESLUTTER:
8282
StatusIkon = DialogReport;
@@ -94,7 +94,7 @@ const UtkastStatusData = (props: { status: UtkastStatus }) => {
9494

9595
return (
9696
<span role="cell" className={'status'}>
97-
<StatusIkon className={ikonFarge} aria-label={ariaLabel} role="img" focusable="false" />
97+
<StatusIkon className={`status_ikon ${ikonFarge}`} aria-label={ariaLabel} role="img" focusable="false" />
9898
<Normaltekst>{mapBrukerStatusTilTekst(props.status)}</Normaltekst>
9999
</span>
100100
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
.column-template() {
1515
grid-template-columns:
16-
minmax(150px, 2fr) minmax(120px, 150px) minmax(100px, 150px) minmax(125px, 250px) minmax(100px, 2fr)
16+
minmax(150px, 2fr) minmax(120px, 150px) minmax(100px, 150px) minmax(135px, 250px) minmax(120px, 2fr)
1717
minmax(100px, 2fr) minmax(100px, 200px) minmax(75px, 150px);
1818
grid-column-gap: 4px;
1919
}

src/hovedside/hovedside.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
&__table {
77
max-width: 1900px;
8-
margin: 2rem 2.5rem;
8+
margin: 0 2.5rem 2rem;
99
}
1010
}

0 commit comments

Comments
 (0)