diff --git a/src/app/(home)/page.module.scss b/src/app/(home)/page.module.scss index 56d3074c3..39f774d31 100644 --- a/src/app/(home)/page.module.scss +++ b/src/app/(home)/page.module.scss @@ -25,7 +25,7 @@ $taktlause: url("backgroundimages/taktlause.jpeg"); .frontInfo { width: 100%; - min-height: 100vh; + min-height: calc(100dvh - 60px); height: 100%; display: grid; place-items: center; diff --git a/src/app/_components/Footer/Footer.module.scss b/src/app/_components/Footer/Footer.module.scss index 4c37e96d3..3c66b3ab4 100644 --- a/src/app/_components/Footer/Footer.module.scss +++ b/src/app/_components/Footer/Footer.module.scss @@ -1,139 +1,141 @@ @use "@/styles/ohma"; - .Footer { font-weight: ohma.$fonts-weight-s; background-color: ohma.$colors-gray-800; color: ohma.$colors-white; - display: grid; - padding: 10*ohma.$gap 20*ohma.$gap; - > * { - p { - margin-bottom: ohma.$gap; - line-height: ohma.$fonts-line-height-m; - } - padding: 0 5*ohma.$gap 0 2*ohma.$gap; - &:nth-child(1) { - padding-left: 0; - grid-area: logos; - } - &:nth-child(2) { - grid-area: info1; - } - &:nth-child(3) { - grid-area: info2; + display: flex; + + + flex-direction: column; + + >.FooterInfo { + display: grid; + padding: 10*ohma.$gap 20*ohma.$gap; + > * { + p { + margin-bottom: ohma.$gap; + line-height: ohma.$fonts-line-height-m; + } + padding: 0 5*ohma.$gap 0 2*ohma.$gap; + &:nth-child(1) { + padding-left: 0; + grid-area: logos; + } + &:nth-child(2) { + grid-area: info1; + } + &:nth-child(3) { + grid-area: info2; + } } - &:nth-child(4) { - grid-area: nordic; + > .info { + > *:first-child { + color: ohma.$colors-primary; + font-weight: ohma.$fonts-weight-m; + font-size: ohma.$fonts-l + } + border-left: solid 1px ohma.$colors-gray-700; + a { + text-decoration: none; + color: ohma.$colors-white; + &:hover { + text-decoration: underline; + } + } } - } - > .info { - > *:first-child { - color: ohma.$colors-primary; - font-weight: ohma.$fonts-weight-m; - font-size: ohma.$fonts-l + .pwa { + @include ohma.yellowIconLink; + padding-left: 0; + width: 100%; + height: 100%; } - border-left: solid 1px ohma.$colors-gray-700; - a { - text-decoration: none; - color: ohma.$colors-white; - &:hover { - text-decoration: underline; + .icons { + display: flex; + justify-content: flex-start; + a > * { + @include ohma.yellowIconLink; + > *:first-child { + padding-left: 0; + } } + } } - .pwa { - @include ohma.yellowIconLink; - padding-left: 0; + .sponsors { + display: flex; + justify-content:center; + align-items: center; + + width: 100%; height: 100%; - } - .icons { - display: flex; - justify-content: flex-start; - a > * { - @include ohma.yellowIconLink; - > *:first-child { - padding-left: 0; - } + > * { + margin: ohma.$gap; + } + a { + width: 100%; + height: 100%; } - } -} - -.sponsors { - display: flex; - justify-content: center; - align-items: center; - width: 100%; - height: 100%; - > * { - margin: ohma.$gap; - } - a { - width: 100%; - height: 100%; + .sponsor { + margin-left: 3%; + margin-right: 3%; + margin-bottom: 2%; } } @media (min-width: 1100px) { .Footer { - grid-template-columns: 2fr 1fr 1fr 1fr; - grid-template-areas: - "logos info1 info2 nordic"; - } - .sponsors { - flex-direction: column; + .FooterInfo { + grid-template-columns: 2fr 1fr 1fr; + grid-template-areas: + "logos info1 info2"; + } } } @media (min-width: ohma.$mobileBreakpoint) and (max-width: 1100px) { - .Footer { + .FooterInfo { grid-template-columns: 2fr 1fr 1fr; grid-template-rows: auto auto; grid-template-areas: "logos info1 info2" - "nordic nordic nordic" ; } - .sponsors { - margin-top: 2*ohma.$gap - } } @media (max-width: ohma.$mobileBreakpoint) { .Footer { - padding: ohma.$gap 2*ohma.$gap; - padding-bottom: 4*ohma.$gap; - grid-template-rows: repeat(auto, 4); - grid-template-areas: - "logos" - "info1" - "info2" - "nordic" - ; - place-items: center; - > .info { - border-left: none; - } - > * { - padding: 0; - margin-top: 5*ohma.$gap; - display: flex; - flex-direction: column; - align-items: center; - :nth-child(1) { - padding-left: none; + > .FooterInfo { + padding: ohma.$gap 2*ohma.$gap; + padding-bottom: 4*ohma.$gap; + grid-template-rows: repeat(auto, 4); + grid-template-areas: + "logos" + "info1" + "info2" + ; + place-items: center; + > .info { + border-left: none; + } + > * { + padding: 0; + margin-top: 5*ohma.$gap; + display: flex; + flex-direction: column; + align-items: center; + :nth-child(1) { + padding-left: none; + } + } + .icons { + justify-content: center; + } + p { + text-align: center; + max-width: 400px; } - } - .icons { - justify-content: center; - } - p { - text-align: center; - max-width: 400px; - } - .sponsors { - flex-direction: column; } } } \ No newline at end of file diff --git a/src/app/_components/Footer/Footer.tsx b/src/app/_components/Footer/Footer.tsx index 1b5512802..93e78ce98 100644 --- a/src/app/_components/Footer/Footer.tsx +++ b/src/app/_components/Footer/Footer.tsx @@ -6,45 +6,61 @@ import Link from 'next/link' function Footer() { return ( ) diff --git a/src/prisma/schema/cms.prisma b/src/prisma/schema/cms.prisma index fd6a1cb08..feef631f5 100644 --- a/src/prisma/schema/cms.prisma +++ b/src/prisma/schema/cms.prisma @@ -11,6 +11,7 @@ enum SpecialCmsImage { FOOTER_1 FOOTER_2 FOOTER_3 + FOOTER_4 LOADER_IMAGE MOBILE_NAV_LOGIN_BUTTON MOBILE_NAV_PRIMARY_BUTTON diff --git a/src/prisma/seeder/src/seedCmsConfig.ts b/src/prisma/seeder/src/seedCmsConfig.ts index ae8fb7264..74c4acf1f 100644 --- a/src/prisma/seeder/src/seedCmsConfig.ts +++ b/src/prisma/seeder/src/seedCmsConfig.ts @@ -112,7 +112,15 @@ export const seedSpecialCmsImageConfig: CmsImageSeedSpecialConfig = { FOOTER_3: { name: 'footer_3', imageName: 'kongsberg', + }, + + FOOTER_4: { + name: 'footer_4', + imageName: 'capgemini', + + }, + LOADER_IMAGE: { name: 'loader_image', imageName: 'logo_simple' diff --git a/src/prisma/seeder/src/seedImagesConfig.ts b/src/prisma/seeder/src/seedImagesConfig.ts index 63a4fa1db..91c2f691c 100644 --- a/src/prisma/seeder/src/seedImagesConfig.ts +++ b/src/prisma/seeder/src/seedImagesConfig.ts @@ -72,6 +72,16 @@ export const seedImageConfig: ImageSeedConfig = [ credit: null, license: null, }, + + { + name: 'capgemini', + alt: 'Capgemini', + fsLocation: 'capgemini.png', + collection: defaultCollection, + credit: null, + license: null, + }, + { name: 'ohma', alt: 'Ohma', diff --git a/src/prisma/seeder/standard_store/images/capgemini.png b/src/prisma/seeder/standard_store/images/capgemini.png new file mode 100644 index 000000000..90dddcf0f Binary files /dev/null and b/src/prisma/seeder/standard_store/images/capgemini.png differ