Skip to content

Commit

Permalink
tilgjengelighetserklæringOppdatering lagt til level så det bare er en…
Browse files Browse the repository at this point in the history
… header (#1190)
  • Loading branch information
MagnusRom authored Jan 30, 2024
1 parent ecb72a1 commit ce29ea2
Show file tree
Hide file tree
Showing 38 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion src/AvtaleOversikt/EtterRegistrering/EtterRegistrering.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const EtterRegistrering: FunctionComponent = () => {
aria-label="Min modalrute"
>
<Modal.Header>
<Heading size="medium" className={cls.element('header')}>
<Heading level='2' size="medium" className={cls.element('header')}>
Søk opp avtalenummer for godkjenning av etterregistrering
</Heading>
</Modal.Header>
Expand Down
2 changes: 1 addition & 1 deletion src/AvtaleOversikt/IngenAvtaler/IngenAvtaler.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const IngenAvtalerHvorDuErMed = () => {
return (
<Innholdsboks>
<div className={cls.element('tekst')}>
<Heading size="large">Ingen avtaler</Heading>
<Heading level='2' size="medium">Ingen avtaler</Heading>
<VerticalSpacer rem={1} />
<Ingress>Det har ikke blitt opprettet noen avtaler hvor du er med enda.</Ingress>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const TaushetserklæringModal: FunctionComponent<TaushetserklæringProps> = ({
</Modal.Header>
<Modal.Body>
<div className={cls.element('modal')}>
<Heading size="medium" className={cls.element('header')}>
<Heading level='2' size="medium" className={cls.element('header')}>
Signer taushetserklæring
</Heading>
<p>Som mentor må du signere en taushetserklæring.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const TausetserklæringTekst = () => {
const cls = BEMHelper('taushetserklæring');
return (
<div style={{ padding: '0.5rem' }}>
<Heading size="medium">Taushetsplikt for avtale</Heading>
<Heading level='2' size="medium">Taushetsplikt for avtale</Heading>
<p>
Forvaltningsloven, arbeids- og velferdsforvaltningsloven og lov om sosiale tjenester i arbeids- og
velferdsforvaltningen inneholder strenge regler om taushetsplikt. Det skal bevares taushet om alle
Expand Down Expand Up @@ -40,7 +40,7 @@ const TausetserklæringTekst = () => {
straffeansvar etter straffeloven §§ 209 og 210.
</p>
<div style={{ padding: '1rem', lineHeight: '0.5rem', fontSize: '0.9rem' }}>
<Heading size="medium">Hva sier regelverket?</Heading>
<Heading level='2' size="medium">Hva sier regelverket?</Heading>
<div className={cls.element('lenker')}>
<EksternLenke
className={cls.element('lenke')}
Expand Down
2 changes: 1 addition & 1 deletion src/AvtaleSide/AvtaleSide.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const AvtaleSide: FunctionComponent = () => {
}}
tekst={sideTittel}
/>
<div className="avtaleside">
<div className="avtaleside" role="main">
{erAvtaleLaast && (
<div className={cls.element('innhold')}>
<BannerNAVAnsatt tekst={sideTittel} undertittel={`Avtalenummer: ${avtale.avtaleNr}`} />
Expand Down
4 changes: 2 additions & 2 deletions src/AvtaleSide/AvtaleStatus/StatusPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ const StatusPanel: React.FunctionComponent<{
<Ikon style={{ height: '40px', width: '40px' }} />
<VerticalSpacer rem={1} />
{header.length > 36 ? (
<Heading size="medium">{header}</Heading>
<Heading level="2" size="medium">{header}</Heading>
) : (
<Heading size="large">{header}</Heading>
<Heading level="2" size="large">{header}</Heading>
)}
</div>

Expand Down
6 changes: 3 additions & 3 deletions src/AvtaleSide/DelLenkeTilAvtalen/SendVarselModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const SendVarselModal: React.FunctionComponent<Props> = (props) => {
aria-modal={props.isOpen}
>
<Modal.Header>
<Heading size="medium">Del lenke til avtalen</Heading>
<Heading level='2' size="medium">Del lenke til avtalen</Heading>
</Modal.Header>
<Modal.Body>
<VerticalSpacer rem={0.5} />
Expand All @@ -40,7 +40,7 @@ const SendVarselModal: React.FunctionComponent<Props> = (props) => {

<VerticalSpacer rem={2} />

<Heading size="small">Send lenke på SMS</Heading>
<Heading level='2' size="small">Send lenke på SMS</Heading>
<VerticalSpacer rem={0.5} />
<LagreKnapp
label="Send til arbeidsgiveren"
Expand All @@ -67,7 +67,7 @@ const SendVarselModal: React.FunctionComponent<Props> = (props) => {

<VerticalSpacer rem={2} />

<Heading size="small">Send lenke manuelt</Heading>
<Heading level='2' size="small">Send lenke manuelt</Heading>
<div className={cls.element('lenkedeling')}>
<div className={cls.element('lenke')}>
<Link href={pathTilOversiktISelvbetjeningProd}>{pathTilOversiktISelvbetjeningProd}</Link>
Expand Down
2 changes: 1 addition & 1 deletion src/AvtaleSide/MobilAvtaleSide/MobilAvtaleSide.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ interface Props {

const MobilAvtaleSide: React.FunctionComponent<Props> = (props) => {
const ekspanderbartPanel = props.avtaleSteg.map((steg) => (
<div className="avtaleside__ekspanderbart-panel" key={steg.id}>
<div role="main" className="avtaleside__ekspanderbart-panel" key={steg.id}>
<Accordion className="accordion">
<Accordion.Item>
<Accordion.Header>{steg.label}</Accordion.Header>
Expand Down
2 changes: 1 addition & 1 deletion src/AvtaleSide/VarselModal/VarselModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const VarselModal: FunctionComponent = () => {
<InfoIkonGul height="80px" width="80px" style={{ margin: '-100px auto 1rem auto' }} />
</Modal.Header>
<Modal.Body>
<Heading size="medium">{harOpprettetHendelse ? 'Hendelselogg' : 'Nye hendelser'}</Heading>
<Heading level='1' size="medium">{harOpprettetHendelse ? 'Hendelselogg' : 'Nye hendelser'}</Heading>

<BodyShort size="small">
{harOpprettetHendelse
Expand Down
2 changes: 1 addition & 1 deletion src/AvtaleSide/Varsellogg/Varsellogg.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const Varsellogg: FunctionComponent = () => {
aria-describedby="varsellogg for endringsaktiviteter i applikasjonen"
>
<Modal.Header>
<Heading size="medium" level="1">
<Heading size="medium" level="2">
Hendelselogg
</Heading>
</Modal.Header>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const BeregningTilskuddSteg: FunctionComponent = () => {
<SkjemaTittel>Beregning av tilskudd</SkjemaTittel>
{avtale.tiltakstype !== 'SOMMERJOBB' && <KvalifiseringsgruppeSats cls={cls} />}
{avtale.tiltakstype === 'SOMMERJOBB' && <OppgiLonnstilskuddprosent />}
<Heading size="small" className={cls.element('lonn-tittel')}>
<Heading level="2" size="small" className={cls.element('lonn-tittel')}>
Lønn per måned i faktisk stillingsprosent inkludert faste og uregelmessige tillegg
</Heading>
<HvaMenesMedDette className={cls.className} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const KvalifiseringsgruppeSats: FunctionComponent<Props> = ({ cls }: Props) => {
<div className={cls.element('kvalifiseringsgruppe')}>
{avtale.tiltakstype === 'VARIG_LONNSTILSKUDD' ? (
<div className={cls.element('tilskuddsprosent')}>
<Heading size="small" className={cls.element('tilskuddsprosent-heading')}>
<Heading level="2" size="small" className={cls.element('tilskuddsprosent-heading')}>
Tilskuddsprosent
</Heading>
<ProsentInput
Expand All @@ -55,14 +55,14 @@ const KvalifiseringsgruppeSats: FunctionComponent<Props> = ({ cls }: Props) => {
</div>
) : (
<div className={cls.element('tilskuddsprosent')}>
<Heading size="small">Tilskuddsprosent</Heading>
<Heading level="2" size="small">Tilskuddsprosent</Heading>
<BodyShort size="small">{settLonnstilskuddsprosent()}</BodyShort>
</div>
)}
</div>
) : (
<div className={cls.element('tilskuddsprosent')}>
<Heading size="small">Tilskuddsprosent</Heading>
<Heading level="2" size="small">Tilskuddsprosent</Heading>
<BodyShort size="small">{settLonnstilskuddsprosent()}</BodyShort>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const TilskuddsPerioderOppsummering = () => {

return (
<>
<Heading size="small">Tilskuddsperioder</Heading>
<Heading level='2' size="small">Tilskuddsperioder</Heading>
<VerticalSpacer rem={1} />
<VisningTilskuddsperioder />
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const GodkjenningVeileder: FunctionComponent = () => {
const ikkeGodkjentAvNoen = !avtale.godkjentAvDeltaker && !avtale.godkjentAvArbeidsgiver;

return (
<Innholdsboks className={cls.className} ariaLabel={'Godkjenn avtalen'}>
<Innholdsboks className={cls.className} ariaLabel={'Godkjenn avtalen'}>
<SkjemaTittel>Godkjenn avtalen</SkjemaTittel>
<GodkjenningInstruks />
{((avtale.tiltakstype !== 'SOMMERJOBB' && !avtale.godkjentAvDeltaker) ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ interface Props {
const GodkjenningStatus: React.FunctionComponent<Props> = (props) => {
return (
<div className="godkjenningstatus">
<Heading size="small">Hvem har godkjent?</Heading>
<Heading level='3' size="small">Hvem har godkjent?</Heading>
<VerticalSpacer rem={0.5} />
<div className="godkjenningstatus__rader">
<GodkjenningRad
Expand Down
2 changes: 1 addition & 1 deletion src/AvtaleSide/steg/GodkjenningSteg/GodkjenningSteg.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const GodkjenningSteg: React.FunctionComponent<Props> = (props) => {
!avtale.avbrutt && (!innloggetBruker.erNavAnsatt || (innloggetBruker.erNavAnsatt && !avtale.erUfordelt));

return (
<div className={cls.className} role={'main'}>
<div className={cls.className}>
<AvtaleStatus />
<Innholdsboks ariaLabel={avtale.avtaleInngått ? 'Oppsummering av inngått avtale' : 'Godkjenning av avtale'}>
<div className={cls.element('wrapper')}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const AvtaleinfoFeltSjekk: FunctionComponent<Props> = (props) => {
} else {
innhold = (
<>
<Heading size="small">{props.navnFelter.map((felt) => felt.verdi).join(' ')}</Heading>
<Heading level='3' size="small">{props.navnFelter.map((felt) => felt.verdi).join(' ')}</Heading>
{props.tilleggFelter.map((felt, index) => (
<React.Fragment key={index}>
<VirksomhetsnummerEllerTelefon felt={felt.felt} verdi={felt.verdi} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import HvaManglerOppsummering from '../HvaManglerOppsummering';
const RelasjonerOppsummering: FunctionComponent<RelasjonerInfo> = (props) => {
return (
<div>
<Heading size="small">Relasjoner</Heading>
<Heading level="2" size="small">Relasjoner</Heading>
<BodyShort size="small">
Er det familiære eller økonomiske relasjoner mellom arbeidsgiveren og deltakeren?
</BodyShort>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const Stegoppsummering: React.FunctionComponent<PropsWithChildren<Props>> = ({ t
<div className={cls.className}>
<div className={cls.element('header')}>
{ikon}
<Heading size="medium" className={cls.element('tittel')}>
<Heading level="2" size="medium" className={cls.element('tittel')}>
{tittel}
</Heading>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const cls = BEMHelper('mål');
const MaalOppsummering: FunctionComponent<MaalListe> = (props) => {
const maalListe = props.maal.map((maal) => (
<div key={maal.id} className={cls.className}>
<Heading size="small" className={cls.element('label')}>
<Heading level='3' size="small" className={cls.element('label')}>
<FormattedMessage id={maal.kategori} />
</Heading>
<BodyShort size="small" className={cls.element('beskrivelse')}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const EndreKontaktInformasjon: FunctionComponent = () => {
lukkModal={() => setModalApen(false)}
>

<Heading size="small" className={cls.element('tittel')}>
<Heading level='3' size="small" className={cls.element('tittel')}>
Informasjon om deltaker
</Heading>
<div className={cls.element('rad')}>
Expand All @@ -120,7 +120,7 @@ const EndreKontaktInformasjon: FunctionComponent = () => {
settVerdi={(verdi) => settNyKontaktInformasjon('deltakerTlf', verdi)}
/>
</div>
<Heading size="small" className={cls.element('tittel')}>
<Heading level='3' size="small" className={cls.element('tittel')}>
Informasjon om veileder
</Heading>
<div className={cls.element('rad')}>
Expand All @@ -142,7 +142,7 @@ const EndreKontaktInformasjon: FunctionComponent = () => {
settVerdi={(verdi) => settNyKontaktInformasjon('veilederTlf', verdi)}
/>
</div>
<Heading size="small" className={cls.element('tittel')}>
<Heading level='3' size="small" className={cls.element('tittel')}>
Kontaktperson for avtalen i bedriften
</Heading>
<div className={cls.element('rad')}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const EndreOppfølgingOgTilrettelegging: FunctionComponent = () => {
<div className={cls.className}>
<div className={cls.element('oppfølging')}>
<div className={cls.element('tittel')}>
<Heading size="small">Oppfølging</Heading>
<Heading level='3' size="small">Oppfølging</Heading>
</div>
<div className={cls.element('textareafelt-wrapper')}>
<PakrevdTextarea
Expand All @@ -83,7 +83,7 @@ const EndreOppfølgingOgTilrettelegging: FunctionComponent = () => {
</div>
<div className={cls.element('Tilrettelegging')}>
<div className={cls.element('tittel')}>
<Heading size="small">Tilrettelegging</Heading>
<Heading level='3' size="small">Tilrettelegging</Heading>
</div>
<div className={cls.element('textareafelt-wrapper')}>
<PakrevdTextarea
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const InkluderingstilskuddSteg: FunctionComponent = () => {
return (
<>
<Innholdsboks utfyller="arbeidsgiver">
<Heading size="medium">Inkluderingstilskudd</Heading>
<Heading level='2' size="medium">Inkluderingstilskudd</Heading>
<VerticalSpacer rem={1} />
<InkluderingstilskuddIngress />
<VerticalSpacer rem={2} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const OpprettEnTilskuddsutgift: FunctionComponent<Props> = (props) => {

return (
<div>
<Heading size="medium">Legg til utgift</Heading>
<Heading level='2' size="medium">Legg til utgift</Heading>
<VerticalSpacer rem={2} />

{leggertilTilskuddsutgift ? (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const Relasjoner: FunctionComponent<Props> = ({ tiltakstype }: Props) => {

return (
<div className={cls.className}>
<Heading size="small" className={cls.element('heading')}>
<Heading level="2" size="small" className={cls.element('heading')}>
Relasjoner
</Heading>
<div className={cls.element('info-ingress')}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const DeltakerInfo: FunctionComponent<{ oppsummeringside: boolean }> = ({
<div className={cls.className}>
<div className={cls.element('ingress', oppsummeringside ? 'oppsummering' : '')}>
{ikon()}
<Heading size="medium">Om deltakeren</Heading>
<Heading level="2" size="medium">Om deltakeren</Heading>
</div>
<div className={cls.element('info-rad')}>
<div className={cls.element('info-container')}>
Expand Down
2 changes: 1 addition & 1 deletion src/AvtaleSide/steg/MaalSteg/Maal/EtMaal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const EtMaal: FunctionComponent<Props> = (props) => {
</>
) : (
<div>
<Heading size="small">{messages[props.maal.kategori]}</Heading>
<Heading level="3" size="small">{messages[props.maal.kategori]}</Heading>
<VerticalSpacer rem={1} />
<BodyShort size="small">Beskrivelse av mål</BodyShort>
<VerticalSpacer rem={1} />
Expand Down
2 changes: 1 addition & 1 deletion src/AvtaleSide/steg/MaalSteg/Maal/OpprettMaal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const OpprettMaal: FunctionComponent<Props> = (props) => {

return (
<div>
<Heading size="medium">Opprett mål</Heading>
<Heading level="2" size="medium">Opprett mål</Heading>
<VerticalSpacer rem={2} />

{leggertilMål ? (
Expand Down
4 changes: 2 additions & 2 deletions src/AvtaleSide/steg/MaalSteg/MaalSteg.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const MaalSteg: FunctionComponent = () => {
};

return (
<div role="main">
<>
<Innholdsboks utfyller="veileder">
<OpprettMaal
iRedigermodus={iRedigermodus}
Expand All @@ -50,7 +50,7 @@ const MaalSteg: FunctionComponent = () => {
ledigeMålkategorier={ledigeMålkategorier}
/>
))}
</div>
</>
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const TilskuddsperiodeBehandlingsTittel: FunctionComponent = () => {

return (
<div className={cls.element('tittel')}>
<Heading size="small">{tittel[avtale.gjeldendeTilskuddsperiode.status]}</Heading>
<Heading level='2' size="small">{tittel[avtale.gjeldendeTilskuddsperiode.status]}</Heading>
<BodyShort size="small">{formatterDato(avtale.opprettetTidspunkt, NORSK_DATO_FORMAT)}</BodyShort>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const BeslutterTilskuddsPerioder: FunctionComponent<Props> = (props) => {

return (
<div className={cls.className}>
<Heading size="small" className={cls.element('tittel')}>
<Heading level='2' size="small" className={cls.element('tittel')}>
Tilskudd som skal godkjennes
</Heading>
<div className={cls.element('container')}>
Expand Down
2 changes: 1 addition & 1 deletion src/InnloggingBoundary/Innloggingsside.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const Innloggingsside = (props: { innloggingskilder: Innloggingskilde[] }) => {
</BodyShort>
</div>
<VerticalSpacer rem={2} />
<Heading size="medium">Logg inn</Heading>
<Heading level='2' size="medium">Logg inn</Heading>
<VerticalSpacer rem={2} />
<div className={'innloggingsside__loginKnapper'}>{logginnknapper}</div>
</div>
Expand Down
Loading

0 comments on commit ce29ea2

Please sign in to comment.