Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

content: add new org map #2066

Merged
merged 3 commits into from
Aug 20, 2024
Merged

content: add new org map #2066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8757275
content: add new org map
MagnusHafstad Aug 20, 2024
d7a2516
fix: requested change
MagnusHafstad Aug 20, 2024
d1083d9
Merge branch 'main' into new-org-map
MagnusHafstad Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/public/img/organisasjonskart2024.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions frontend/src/app/_components/LandingHero/OrganizationsSlider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import { Swiper, SwiperSlide } from "swiper/react";
// Import Swiper styles
import "swiper/css";

import { Link } from "@/app/components/Link";

import { Organization, OrganizationLink } from "./OrganizationLink";

import { Link } from "@/app/components/Link";

const organizations: Readonly<Organization[]> = [
{ name: "Janus", internalUrl: "/janus" },
{ name: "Janus Sosial", internalUrl: "/janus" },
{ name: "Bindeleddet", externalUrl: "https://www.bindeleddet.no" },
{ name: "ESTIEM", externalUrl: "https://sites.google.com/view/estiem-ntnu" },
{ name: "Janus Kultur", internalUrl: "/about/organization?category=kultur" },
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/about/organization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const OrganizationPage: NextPageWithLayout<InferGetStaticPropsType<typeof getSta
nextPost={{ title: "Les om Hovedstyret", slug: "/about/board", cover: "/img/hero.jpg" }}
>
<Box height={460} position="relative">
<Image src="/img/organisasjonskart2023.svg" alt="Foreningskart" fill priority />
<Image src="/img/organisasjonskart2024.svg" alt="Foreningskart" fill priority />
</Box>

<Typography variant="h3" component="h2" gutterBottom>
Expand Down
Loading