Skip to content

Chore/footer logocss #450

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Chore/footer logocss #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d40a4ee
move sponsor to a new row, add org. number, remove phone number
ksgprogrammerer Oct 6, 2025
a42e9f1
slettet linje
ksgprogrammerer Oct 11, 2025
83c7044
chore: add capgemini image
ksgprogrammerer Oct 13, 2025
7239e22
chore: add footer bottom margin
ksgprogrammerer Oct 13, 2025
c75e17f
merge branch main into chore/footerLogocss
ksgprogrammerer Oct 13, 2025
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
2 changes: 1 addition & 1 deletion src/app/(home)/page.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
204 changes: 103 additions & 101 deletions src/app/_components/Footer/Footer.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
84 changes: 50 additions & 34 deletions src/app/_components/Footer/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,61 @@ import Link from 'next/link'
function Footer() {
return (
<footer className={styles.Footer}>
<div>
<SpecialCmsImage special="FOOTER_LOGO" width={350} />
<p>
Linjeforeningen for Elektronisk Systemdesign
og Innovasjon (MTELSYS) og Kybernetikk og
Robotikk (MTTK) ved Norges Tekniske-Naturvitenskapelige Universitet (NTNU)
</p>
<p>Org. Nr. 890 384 692</p>
<div className={styles.FooterInfo}>
<div>
<SpecialCmsImage special="FOOTER_1" width={200} >
<Link className={styles.pwa} href="/infopages/pwa" />
</SpecialCmsImage>
<div className={styles.icons}>
<SocialIcons />
<SpecialCmsImage special="FOOTER_LOGO" width={350} />
<p>
Linjeforening for Elektronisk Systemdesign
og Innovasjon (MTELSYS) og Kybernetikk og
Robotikk (MTTK) ved Norges Tekniske-Naturvitenskapelige Universitet (NTNU)
</p>
<p>Org Nr. 890 384 692</p>

<div>
<SpecialCmsImage special="FOOTER_1" width={200} >
<Link className={styles.pwa} href="/infopages/pwa" />
</SpecialCmsImage>
<div className={styles.icons}>
<SocialIcons />
</div>
</div>
</div>
<div className={styles.info}>
<p>Kontakt:</p>
<p>Bedrift: <a href="mailto:post@contactor.no">post@contactor.no</a></p>
<p>Teknisk: <a href="mailto:vevcom@omega.ntnu.no">vevcom@omega.ntnu.no</a></p>
<p>PR: <a href="mailto:blaest@omega.ntnu.no">blaest@omega.ntnu.no</a></p>
<p>Annet: <a href="mailto:hs@omega.ntnu.no">hs@omega.ntnu.no</a></p>
</div>
<div className={styles.info}>
<p>Adresse:</p>
<p>Sct.Omega Broderskab</p>
<p>NTNU Gløshaugen</p>
<p>Elektro-bygget</p>
<p>7491 Trondheim</p>
</div>
</div>
<div className={styles.info}>
<p>Kontakt:</p>
<p>Bedrift: <a href="mailto:post@contactor.no">post@contactor.no</a></p>
<p>Teknisk: <a href="mailto:vevcom@omega.ntnu.no">vevcom@omega.ntnu.no</a></p>
<p>PR: <a href="mailto:blaest@omega.ntnu.no">blaest@omega.ntnu.no</a></p>
<p>Annet: <a href="mailto:hs@omega.ntnu.no">hs@omega.ntnu.no</a></p>
<p>Tlf: <a href="tel:73594211">73 59 42 11</a></p>
</div>
<div className={styles.info}>
<p>Adresse:</p>
<p>Sct.Omega Broderskab</p>
<p>NTNU Gløshaugen</p>
<p>Elektro-bygget</p>
<p>7491 Trondheim</p>
</div>

<div className={styles.sponsors}>
<SpecialCmsImage special="FOOTER_2" width={170}>
<Link href="http://www.nordicsemi.com" target="_blank" />
</SpecialCmsImage>
<SpecialCmsImage special="FOOTER_3" width={100}>
<Link href="http://www.kongsberg.com" target="_blank" />
</SpecialCmsImage>
<div className={styles.sponsor}>
<SpecialCmsImage special="FOOTER_2" width={170}>
<Link href="http://www.nordicsemi.com" target="_blank" />
</SpecialCmsImage>
</div>
<div className={styles.sponsor}>
<SpecialCmsImage special="FOOTER_3" width={100}>
<Link href="http://www.kongsberg.com" target="_blank" />
</SpecialCmsImage>
</div>
<div className={styles.sponsor}>
<SpecialCmsImage special="FOOTER_4" width={100}>
<Link href="https://www.capgemini.com/" target="_blank" />
</SpecialCmsImage>
</div>




</div>
</footer>
)
Expand Down
1 change: 1 addition & 0 deletions src/prisma/schema/cms.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ enum SpecialCmsImage {
FOOTER_1
FOOTER_2
FOOTER_3
FOOTER_4
LOADER_IMAGE
MOBILE_NAV_LOGIN_BUTTON
MOBILE_NAV_PRIMARY_BUTTON
Expand Down
8 changes: 8 additions & 0 deletions src/prisma/seeder/src/seedCmsConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 10 additions & 0 deletions src/prisma/seeder/src/seedImagesConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Binary file added src/prisma/seeder/standard_store/images/capgemini.png
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.
Loading