Skip to content
This repository was archived by the owner on Sep 29, 2020. It is now read-only.

Commit e9fd52e

Browse files
tor-navtor-nav
authored
TFP-3337 Fiks diverse småplukk i design i vedtakspanel (#1190)
1 parent 59571c8 commit e9fd52e

File tree

6 files changed

+80
-86
lines changed

6 files changed

+80
-86
lines changed

‎packages/assets/styles/global.less

+2-31
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@import '@{coreModulePath}nav-frontend-core/less/core';
22
@import './dayPicker';
33

4+
/* TODO Mesteparten i denne fila bør ikkje ligga her */
5+
46
html {
57
height: 100%;
68
}
@@ -33,37 +35,6 @@ som fra core/og muligen import fra alla andra komponenter
3335
font-style: italic;
3436
}
3537

36-
:global(.lenke) {
37-
background: none;
38-
border: 0;
39-
border-bottom: solid 1px @navGra40;
40-
color: @navBla;
41-
cursor: pointer;
42-
padding: 0;
43-
text-decoration: none;
44-
45-
&:hover,
46-
&--hover {
47-
border-bottom-color: @navBla;
48-
}
49-
50-
&:focus,
51-
&--focus {
52-
background-color: @orangeFocus;
53-
outline: none;
54-
}
55-
56-
&:active,
57-
&--active {
58-
border-bottom-color: @navDypBla;
59-
color: @navDypBla;
60-
}
61-
62-
&--frittstaende {
63-
border-bottom: 0;
64-
}
65-
}
66-
6738
:global(.skjemaelement > .skjemaelement) {
6839
&__feilmelding {
6940
margin-top: 1rem;

‎packages/prosess-vedtak/src/components/felles/ManueltVedtaksbrevPanel.tsx

+24-19
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,35 @@ const ManueltVedtaksbrevPanel: FunctionComponent<OwnProps> = ({
3535
skalViseLink,
3636
}) => (
3737
<>
38+
<VerticalSpacer thirtyTwoPx />
3839
<AvsnittSkiller />
39-
<VerticalSpacer twentyPx />
40-
<Row>
41-
<Column xs="3">
42-
<Element>
43-
<FormattedMessage id="FritekstBrevPanel.ManueltVedtaksbrev" />
44-
</Element>
45-
</Column>
46-
<Column xs="2">
47-
<EtikettLiten>
48-
<FormattedMessage id={getLanguageCodeFromSprakkode(sprakkode)} />
49-
</EtikettLiten>
50-
</Column>
51-
<Column xs="5">
52-
{!readOnly && skalViseLink && (
40+
<VerticalSpacer thirtyTwoPx />
41+
<FlexContainer>
42+
<FlexRow>
43+
<FlexColumn className={styles.space}>
44+
<Element className={styles.avsnittOverskrift}>
45+
<FormattedMessage id="FritekstBrevPanel.ManueltVedtaksbrev" />
46+
</Element>
47+
</FlexColumn>
48+
<FlexColumn className={styles.space}>
49+
<EtikettLiten>
50+
<FormattedMessage id={getLanguageCodeFromSprakkode(sprakkode)} />
51+
</EtikettLiten>
52+
</FlexColumn>
53+
<FlexColumn>
54+
{!readOnly && skalViseLink && (
5355
<>
5456
<Lenke href="#" onClick={previewOverstyrtBrev}>
55-
<FormattedMessage id="FritekstBrevPanel.ForhandsvisManueltVedtaksbrev" />
57+
<span>
58+
<FormattedMessage id="FritekstBrevPanel.ForhandsvisManueltVedtaksbrev" />
59+
</span>
60+
<Image src={popOutPilSvg} className={styles.pil} />
5661
</Lenke>
57-
<Image src={popOutPilSvg} className={styles.pil} />
5862
</>
59-
)}
60-
</Column>
61-
</Row>
63+
)}
64+
</FlexColumn>
65+
</FlexRow>
66+
</FlexContainer>
6267
<hr className={styles.line} />
6368
<VerticalSpacer twentyPx />
6469
{!readOnly && (

‎packages/prosess-vedtak/src/components/felles/VedtakFellesPanel.spec.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,6 @@ describe('<VedtakFellesPanel>', () => {
104104
submitting={false}
105105
/>);
106106

107-
expect(wrapper.find('span')).to.have.length(1);
107+
expect(wrapper.find('span')).to.have.length(3);
108108
});
109109
});

‎packages/prosess-vedtak/src/components/felles/VedtakFellesPanel.tsx

+40-35
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import React, {
33
} from 'react';
44
import { FormattedMessage, injectIntl, WrappedComponentProps } from 'react-intl';
55
import { Element, Undertittel, Normaltekst } from 'nav-frontend-typografi';
6-
import { Column, Row } from 'nav-frontend-grid';
76
import Lenke from 'nav-frontend-lenker';
87
import { Hovedknapp, Knapp } from 'nav-frontend-knapper';
98

@@ -128,44 +127,50 @@ const VedtakFellesPanel: FunctionComponent<OwnProps & WrappedComponentProps> = (
128127
</FlexRow>
129128
</FlexContainer>
130129
<VerticalSpacer eightPx />
131-
<Row>
132-
<Column xs="3">
133-
<Element>
134-
{vedtakstatusTekst}
135-
{tilbakekrevingtekst && (
136-
`. ${intl.formatMessage({ id: tilbakekrevingtekst })}`
130+
<FlexContainer>
131+
<FlexRow>
132+
<FlexColumn className={styles.space}>
133+
<Element>
134+
{vedtakstatusTekst}
135+
{tilbakekrevingtekst && (
136+
`. ${intl.formatMessage({ id: tilbakekrevingtekst })}`
137+
)}
138+
</Element>
139+
</FlexColumn>
140+
<FlexColumn className={styles.space}>
141+
{skalViseLink && !erBehandlingEtterKlage && harIkkeKonsekvensForYtelse && (
142+
<>
143+
<Lenke href="#" onClick={previewAutomatiskBrev}>
144+
<span>
145+
<FormattedMessage id="VedtakFellesPanel.AutomatiskVedtaksbrev" />
146+
</span>
147+
<Image src={popOutPilSvg} className={styles.pil} />
148+
</Lenke>
149+
</>
137150
)}
138-
</Element>
139-
</Column>
140-
<Column xs="3">
141-
{skalViseLink && !erBehandlingEtterKlage && harIkkeKonsekvensForYtelse && (
151+
</FlexColumn>
152+
<FlexColumn>
153+
{!readOnly && !skalBrukeManueltBrev && (
142154
<>
143-
<Lenke href="#" onClick={previewAutomatiskBrev}>
144-
<FormattedMessage id="VedtakFellesPanel.AutomatiskVedtaksbrev" />
155+
<Lenke href="#" onClick={onToggleOverstyring} className={skalBrukeManueltBrev && styles.test}>
156+
<Image src={endreSvg} className={styles.blyant} />
157+
<span>
158+
<FormattedMessage id="VedtakFellesPanel.RedigerVedtaksbrev" />
159+
</span>
145160
</Lenke>
146-
<Image src={popOutPilSvg} className={styles.pil} />
147161
</>
148-
)}
149-
</Column>
150-
<Column xs="3">
151-
{!readOnly && !skalBrukeManueltBrev && (
152-
<>
153-
<Image src={endreSvg} className={styles.blyant} />
154-
<Lenke href="#" onClick={onToggleOverstyring} className={skalBrukeManueltBrev && styles.test}>
155-
<FormattedMessage id="VedtakFellesPanel.RedigerVedtaksbrev" />
156-
</Lenke>
157-
</>
158-
)}
159-
{(readOnly || skalBrukeManueltBrev) && (
160-
<>
161-
<Image src={endreDisabletSvg} className={styles.blyant} />
162-
<Normaltekst className={styles.disabletLink}>
163-
<FormattedMessage id="VedtakFellesPanel.RedigerVedtaksbrev" />
164-
</Normaltekst>
165-
</>
166-
)}
167-
</Column>
168-
</Row>
162+
)}
163+
{(readOnly || skalBrukeManueltBrev) && (
164+
<>
165+
<Image src={endreDisabletSvg} className={styles.blyant} />
166+
<Normaltekst className={styles.disabletLink}>
167+
<FormattedMessage id="VedtakFellesPanel.RedigerVedtaksbrev" />
168+
</Normaltekst>
169+
</>
170+
)}
171+
</FlexColumn>
172+
</FlexRow>
173+
</FlexContainer>
169174
<VedtakHelpTextPanel aksjonspunkter={aksjonspunkter} readOnly={readOnly} />
170175
<VerticalSpacer twentyPx />
171176
{renderPanel(skalBrukeManueltBrev, erInnvilget, erAvslatt, erOpphor)}

‎packages/prosess-vedtak/src/components/felles/manueltVedtaksbrevPanel.less

+9
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,12 @@
3030
.pil {
3131
margin-left: 5px;
3232
}
33+
34+
.space {
35+
margin-right: 50px;
36+
}
37+
38+
.avsnittOverskrift {
39+
font-size: 1.125rem;
40+
font-weight: 600;
41+
}

‎packages/prosess-vedtak/src/components/felles/vedtakFellesPanel.less

+4
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@
1717
color: @navGra20;
1818
display: inline;
1919
}
20+
21+
.space {
22+
margin-right: 50px;
23+
}

0 commit comments

Comments
 (0)