Skip to content

Commit f11a366

Browse files
committedNov 22, 2023
Nya bilder och layouter för NLG23/24
1 parent 5714b7c commit f11a366

34 files changed

+21666
-20724
lines changed
 

‎package-lock.json

+10,285-9,434
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"author": "Kyle Mathews <mathews.kyle@gmail.com>",
77
"dependencies": {
88
"@contentful/rich-text-react-renderer": "^15.11.0",
9-
"gatsby": "^4.4.0",
9+
"gatsby": "^4.25.7",
1010
"gatsby-plugin-image": "^2.4.0",
1111
"gatsby-plugin-manifest": "^4.4.0",
1212
"gatsby-plugin-react-helmet": "^5.10.0",

‎src/images/bg.png

961 KB
Loading

‎src/images/grupp.jpg

-369 KB
Binary file not shown.

‎src/images/gruppen.jpg

1.99 MB
Loading

‎src/images/hemsida.jpg

-375 KB
Binary file not shown.

‎src/images/hemsida2.jpg

-366 KB
Binary file not shown.

‎src/images/profilbilder/hs/bahar.png

411 KB
Loading

‎src/images/profilbilder/hs/david.png

410 KB
Loading

‎src/images/profilbilder/hs/ebba.png

387 KB
Loading

‎src/images/profilbilder/hs/emil.jpg

-557 KB
Binary file not shown.

‎src/images/profilbilder/hs/erik.png

388 KB
Loading

‎src/images/profilbilder/hs/favour.png

401 KB
Loading

‎src/images/profilbilder/hs/george.jpg

-541 KB
Binary file not shown.

‎src/images/profilbilder/hs/joakim.jpg

-329 KB
Binary file not shown.

‎src/images/profilbilder/hs/joakim.png

412 KB
Loading

‎src/images/profilbilder/hs/joel.png

426 KB
Loading

‎src/images/profilbilder/hs/jose.jpg

-657 KB
Binary file not shown.

‎src/images/profilbilder/hs/kajsa.jpg

-582 KB
Binary file not shown.

‎src/images/profilbilder/hs/liza.png

394 KB
Loading

‎src/images/profilbilder/hs/marcus.jpg

-485 KB
Binary file not shown.

‎src/images/profilbilder/hs/molly.jpg

-339 KB
Binary file not shown.

‎src/images/profilbilder/hs/molly.png

424 KB
Loading

‎src/images/profilbilder/hs/negar.jpg

-586 KB
Binary file not shown.

‎src/images/profilbilder/hs/negar.png

426 KB
Loading

‎src/images/profilbilder/hs/patrik.jpg

-507 KB
Binary file not shown.

‎src/images/profilbilder/hs/tindra.jpg

-544 KB
Binary file not shown.
422 KB
Loading
1.63 MB
Loading

‎src/images/profilbilder/hs/yabing.png

403 KB
Loading

‎src/pages/about.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react"
22
import Layout from "../components/layout"
3-
import hemsida2 from "../images/hemsida2.jpg"
3+
import gruppen from "../images/gruppen.jpg"
44
import event from "../images/event.jpg"
55
import meta from "../images/meta.jpg"
66
import internet from "../images/internet.jpg"
@@ -19,7 +19,7 @@ export default function About() {
1919
<div className={styles.containerCenter}>
2020
<div>
2121
<h1>Om oss</h1>
22-
<img src={hemsida2} className={styles.groupImage} />
22+
<img src={gruppen} className={styles.groupImage} />
2323
<p><span>Vi är NLG, <a href="https://www.medieteknik.com/">Medietekniksektionens</a> näringslivsgrupp på KTH. </span>
2424
Medieteknik är en kreativ civilingenjörsutbildning som skolar nästa generations utvecklare, UX-designers, projektledare och spelutvecklare.
2525
Vi blandar traditionella ingenjörsämnen med programmering, interaktionsdesign, datorgrafik, visualisering, och maskininlärning bland annat. <a href="https://www.kth.se/utbildning/civilingenjor/medieteknik/medieteknik-civilingenjor-300-hp-1.4150">Här</a> hittar ni mer information om programmet.

‎src/pages/contact.module.scss

+41-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
flex-direction: column;
77
align-items: center;
88
justify-content: center;
9+
background-image:url('../images/bg.png');
10+
background-size: cover;
911
}
1012
.containerCenter {
1113
margin: 16px;
@@ -54,7 +56,7 @@
5456
background: $color-background-card;
5557
box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;
5658
border-radius: 4px;
57-
59+
text-wrap: nowrap;
5860

5961
}
6062

@@ -80,13 +82,20 @@
8082

8183
}
8284

85+
.invisiblecard {
86+
margin: 32px 0;
87+
padding: 32px;
88+
}
89+
8390

8491
.profileImage {
8592
display: block;
86-
height: 80px;
93+
height: 100px;
8794
margin: 0 auto;
8895
margin-top: 32px;
8996
clip-path: circle();
97+
/*border-radius:35px;*/
98+
9099
}
91100

92101

@@ -101,14 +110,35 @@
101110
font-size: 15px;
102111
}
103112
}
104-
.card {
113+
.invisiblecard_wide {
114+
float: left;
115+
width: 24%;
116+
margin: 5px 0;
117+
padding:20px;
118+
margin-right: 1%;
119+
border-radius: 4px;
120+
}
121+
122+
.invisiblecard_thin {
123+
float: left;
124+
width: 15.66666667%;
125+
margin: 5px 0;
126+
padding: 20px;
127+
margin-right:1%;
128+
background: $color-background-card;
129+
box-shadow: rgba(100, 100, 110, 0.2) 0px 7px 29px 0px;
130+
border-radius: 4px;
131+
}
132+
133+
.card {
105134
width: 350px;
106135
margin-left:auto;
107136
margin-right:auto;
108137
margin-bottom: 5px;
109138
padding:20px;
110139
}
111-
.card2 {
140+
141+
.card2 { /* 1/4 */
112142
float: left;
113143
width: 24%;
114144
margin: 5px 0;
@@ -117,8 +147,10 @@
117147
background: $color-background-card;
118148
box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;
119149
border-radius: 4px;
150+
text-wrap: nowrap;
120151
}
121-
.card3 {
152+
153+
.card3 { /* 1/6 */
122154
float: left;
123155
width: 15.66666667%;
124156
margin: 5px 0;
@@ -127,17 +159,19 @@
127159
background: $color-background-card;
128160
box-shadow: rgba(100, 100, 110, 0.2) 0px 7px 29px 0px;
129161
border-radius: 4px;
162+
text-wrap: nowrap;
130163
}
131164

132-
.card4 {
165+
.card4 { /* 1/5 */
133166
float: left;
134-
width: 15.66666667%;
167+
width: 19%;
135168
margin: 5px 0;
136169
padding: 20px;
137170
margin-right:1%;
138171
background: $color-background-card;
139172
box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;
140173
border-radius: 4px;
174+
text-wrap: nowrap;
141175
}
142176

143177
.card5 {

‎src/pages/contact.tsx

+71-51
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
import React from "react"
22
import Layout from "../components/layout"
33
import placeholder from "../images/profilbilder/hs/default.png"
4-
import joakim from "../images/profilbilder/hs/joakim.jpg"
5-
import tindra from "../images/profilbilder/hs/tindra.jpg"
6-
import emil from "../images/profilbilder/hs/emil.jpg"
7-
import george from "../images/profilbilder/hs/george.jpg"
8-
import jose from "../images/profilbilder/hs/jose.jpg"
9-
import kajsa from "../images/profilbilder/hs/kajsa.jpg"
10-
import marcus from "../images/profilbilder/hs/marcus.jpg"
11-
import negar from "../images/profilbilder/hs/negar.jpg"
12-
import patrik from "../images/profilbilder/hs/patrik.jpg"
13-
import molly from "../images/profilbilder/hs/molly.jpg"
4+
import joakim from "../images/profilbilder/hs/joakim.png"
5+
import bahar from "../images/profilbilder/hs/bahar.png"
6+
import david from "../images/profilbilder/hs/david.png"
7+
import ebba from "../images/profilbilder/hs/ebba.png"
8+
import erik from "../images/profilbilder/hs/erik.png"
9+
import favour from "../images/profilbilder/hs/favour.png"
10+
import joel from "../images/profilbilder/hs/joel.png"
11+
import liza from "../images/profilbilder/hs/liza.png"
12+
import molly from "../images/profilbilder/hs/molly.png"
13+
import negar from "../images/profilbilder/hs/negar.png"
14+
import tingting from "../images/profilbilder/hs/tingting.png"
15+
import tingting_negar from "../images/profilbilder/hs/tingting_negar.png"
16+
import yabing from "../images/profilbilder/hs/yabing.png"
1417
import * as styles from "./contact.module.scss"
1518

1619
function Contact() {
@@ -25,71 +28,88 @@ function Contact() {
2528
saker ni vill hitta på med våra studenter.
2629
</p>
2730
<div className={styles.card}>
28-
<h2>Näringslivsansvarig</h2>
29-
<img src={emil} className={styles.profileImage} />
30-
<p>Emil Lidbom</p>
31+
<h2>Näringslivsansvariga</h2>
32+
<img src={tingting_negar} className={styles.profileImage} />
33+
<p>Ting Ting Li och Negar Fazeli</p>
3134
<a href="mailto: naringsliv@medieteknik.com">
3235
naringsliv@medieteknik.com
3336
</a>
3437
</div>
3538
<div className={styles.card2}>
36-
<h2>Sälj</h2>
37-
<img src={negar} className={styles.profileImage} />
38-
<p>Negar Fazeli</p>
39-
<a href="mailto: negar@medieteknik.com">negar@medieteknik.com</a>
39+
<h2>Företag</h2>
40+
<img src={david} className={styles.profileImage} />
41+
<p>David Franzén</p>
42+
<a href="mailto: david@medieteknik.com">david@medieteknik.com</a>
4043
</div>
4144
<div className={styles.card2}>
42-
<h2>Sälj</h2>
43-
<img src={george} className={styles.profileImage} />
44-
<p>George Dalman</p>
45-
<a href="mailto: george@medieteknik.com">george@medieteknik.com</a>
45+
<h2>Företag</h2>
46+
<img src={liza} className={styles.profileImage} />
47+
<p>Liza Aziz</p>
48+
<a href="mailto: liza@medieteknik.com">liza@medieteknik.com</a>
4649
</div>
4750
<div className={styles.card2}>
48-
<h2>Sälj</h2>
49-
<img src={marcus} className={styles.profileImage} />
50-
<p>Marcus Påhlman</p>
51-
<a href="mailto: marcus@medieteknik.com">marcus@medieteknik.com</a>
51+
<h2>Företag</h2>
52+
<img src={joel} className={styles.profileImage} />
53+
<p>Joel von Krusenstjerna</p>
54+
<a href="mailto: joel@medieteknik.com">joel@medieteknik.com</a>
5255
</div>
5356
<div className={styles.card2}>
54-
<h2>Sälj</h2>
55-
<img src={tindra} className={styles.profileImage} />
56-
<p>Tindra Li</p>
57-
<a href="mailto: tindra@medieteknik.com">tindra@medieteknik.com</a>
57+
<h2>Företag</h2>
58+
<img src={placeholder} className={styles.profileImage} />
59+
<p>George Dalman</p>
60+
<a href="mailto: george@medieteknik.com">george@medieteknik.com</a>
5861
</div>
59-
<div className={styles.card2}>
60-
<h2>Logistikansvarig</h2>
61-
<img src={kajsa} className={styles.profileImage} />
62-
<p>Kajsa Lidin</p>
63-
<a href="mailto: kajsa@medieteknik.com">kajsa@medieteknik.com</a>
62+
<div className={styles.card4}>
63+
<h2>Logistik</h2>
64+
<img src={favour} className={styles.profileImage} />
65+
<p>Favour Ezennaya</p>
66+
<a href="mailto: favour@medieteknik.com">favour@medieteknik.com</a>
6467
</div>
65-
<div className={styles.card3_longmailfix}>
68+
<div className={styles.card4}>
69+
<h2>Logistik</h2>
70+
<img src={yabing} className={styles.profileImage} />
71+
<p>Yabing Cai</p>
72+
<a href="mailto: yabing@medieteknik.com">yabing@medieteknik.com</a>
73+
</div>
74+
<div className={styles.card4}>
6675
<h2>PR</h2>
67-
<img src={patrik} className={styles.profileImage} />
68-
<p>Patrik Larsson</p>
69-
<a href="mailto: patrik.pr@medieteknik.com">
70-
patrik.pr@medieteknik.com
71-
</a>
76+
<img src={molly} className={styles.profileImage} />
77+
<p>Molly Gidfors Haraldsson</p>
78+
<a href="mailto: mollyha@kth.se">mollyha@kth.se</a>
7279
</div>
73-
<div className={styles.card3}>
80+
<div className={styles.card4}>
7481
<h2>PR</h2>
75-
<img src={jose} className={styles.profileImage} />
76-
<p>Jose W. Velásquez C</p>
77-
<a href="mailto: jwevc@kth.se">
78-
jwevc@kth.se
82+
<img src={bahar} className={styles.profileImage} />
83+
<p>Bahar Kimanos</p>
84+
<a href="mailto: bahar@medieteknik.com">
85+
bahar@medieteknik.com
7986
</a>
8087
</div>
81-
<div className={styles.card3}>
88+
<div className={styles.card4}>
8289
<h2>PR</h2>
83-
<img src={molly} className={styles.profileImage} />
84-
<p>Molly Gidfors Haraldsson</p>
85-
<a href="mailto: mollyha@kth.se">mollyha@kth.se</a>
90+
<img src={ebba} className={styles.profileImage} />
91+
<p>Ebba Adolphson</p>
92+
<a href="mailto: adolphson@medieteknik.com">
93+
adolphson@medieteknik.com
94+
</a>
8695
</div>
96+
97+
<div className={styles.invisiblecard_wide}></div>
98+
8799
<div className={styles.card2}>
88100
<h2>Webbansvarig</h2>
89101
<img src={joakim} className={styles.profileImage} />
90102
<p>Joakim Strand</p>
91-
<a href="mailto: joakstr@kth.se">
92-
joakstr@kth.se
103+
<a href="mailto: joakim@medieteknik.com">
104+
joakim@medieteknik.com
105+
</a>
106+
</div>
107+
<div className={styles.card2}>
108+
<h2>Webbansvarig</h2>
109+
<img src={erik} className={styles.profileImage} />
110+
<p>Erik Sevelin</p>
111+
<a href="mailto: esevelin@kth.se">
112+
esevelin@kth.se
93113
</a>
94114
</div>
95115
</div>

‎yarn.lock

+11,266-11,229
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.