Skip to content

Commit

Permalink
Merge branch 'fjern_login_context' of https://github.com/navikt/min-s…
Browse files Browse the repository at this point in the history
…ide-arbeidsgiver into fjern_login_context
  • Loading branch information
ebelegu committed Oct 16, 2023
2 parents 935bac8 + 5937d3b commit e6d5169
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 28 deletions.
2 changes: 2 additions & 0 deletions src/App/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ const miljø = gittMiljo<'local' | 'labs' | 'dev' | 'prod'>({
});

const AmplitudeSidevisningEventLogger: FunctionComponent = (props) => {
const location = useLocation();

useEffect(() => {
loggSidevisning(location.pathname, true);

Check failure on line 33 in src/App/App.tsx

View workflow job for this annotation

GitHub Actions / CICD

Expected 1 arguments, but got 2.
}, [location.pathname]);
Expand Down
14 changes: 7 additions & 7 deletions src/App/InformasjonOmBedrift/InformasjonOmBedrift.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.informasjon-om-bedrift {
margin: 24px auto;
padding: 2rem;
max-width: 60rem;
width: 100%;
margin: 24px auto;
padding: 2rem;
max-width: 60rem;
width: 100%;
}

.informasjon-om-bedrift .ny-fane-ikon {
margin-top: 3px;
margin-top: 3px;
}

.informasjon-om-bedrift hr {
width: 100%;
}
width: 100%;
}
6 changes: 3 additions & 3 deletions src/App/InformasjonOmBedrift/Kontaktinfo.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.kontaktinfo {
.kontaktinfo{
display: flex;
flex-direction: column;
gap: 16px;
Expand All @@ -16,8 +16,8 @@
padding: 0;
}

.kontaktinfo-tittel {
.kontaktinfo-tittel{
display: flex;
align-items: center;
gap: 8px;
}
}
27 changes: 14 additions & 13 deletions src/App/InformasjonOmBedrift/OverordnetEnhet/OverordnetEnhet.css
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@

@media (min-width: 768px) {
.overordnet-enhet-info__container {
width: 32rem;
display: flex;
flex-wrap: wrap;
}
.overordnet-enhet-info__container .tekstboks {
width: 16rem;
}
.overordnet-enhet-info__container {
width: 32rem;
display: flex;
flex-wrap: wrap;
}
.overordnet-enhet-info__container .tekstboks {
width: 16rem;
}
}
.overordnet-enhet-info__navn {
display: flex;
align-items: center;
text-transform: uppercase;
gap: 0.5rem;
display: flex;
align-items: center;
text-transform: uppercase;
gap: 0.5rem
}
.overordnet-enhet-info__navn .overordnetenhet-ikon {
margin-right: 0.3rem;
margin-right: 0.3rem;
}
10 changes: 5 additions & 5 deletions src/App/InformasjonOmBedrift/Underenhet/Underenhet.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.underenhet-info__navn {
display: flex;
align-items: center;
text-transform: uppercase;
gap: 0.5rem;
display: flex;
align-items: center;
text-transform: uppercase;
gap: 0.5rem
}
.underenhet-info__navn .underenhet-ikon {
margin-right: 0.3rem;
margin-right: 0.3rem;
}

0 comments on commit e6d5169

Please sign in to comment.