diff --git a/src/components/Info.scss b/src/components/Info.scss index 5cb5b16..c5a4f64 100644 --- a/src/components/Info.scss +++ b/src/components/Info.scss @@ -1,14 +1,52 @@ @import '../colors.scss'; .Info { - h1 { - font-size: 4rem; - } + display: flex; + justify-content: center; + font-weight: bold; - h2 { - font-size: 2rem; - color: $green-text; - margin-left: 3rem; - margin-right: 3rem; + .Info-container { + display: flex; + flex-direction: column; + margin-bottom: 3rem; + + h1 { + font-size: 4rem; + } + + h2 { + font-size: 2rem; + color: $green-text; + font-family: 'Montserrat-Medium'; + margin-left: 3rem; + margin-right: 3rem; + margin-top: 3rem; + } + + h3 { + font-size: 1.7rem; + color: $brown-text; + text-decoration: underline; + margin-top: 2rem; + } + + p { + font-size: 1.2rem; + margin-top: 1rem; + } + + img { + width: 20rem; + } + } +} + +@media screen and (max-width: 600px) { + .Info { + .Info-container { + img { + width: 18rem; + } + } } } diff --git a/src/components/Info.tsx b/src/components/Info.tsx index 18b617e..5c49716 100644 --- a/src/components/Info.tsx +++ b/src/components/Info.tsx @@ -1,15 +1,81 @@ import { FormattedMessage } from 'react-intl'; import './Info.scss'; +import kauppa from '../img/kauppa.jpg'; +import livonsaariCaravan from '../img/livonsaariCaravan.jpg'; +import seurantalo from '../img/seurantalo.jpg'; +import vanhaSalakuljettaja from '../img/vanhaSalakuljettaja.jpg'; +import vaihela from '../img/vaihela.jpg'; export const Info = () => { return (
-

- -

-

- -

+
+

+ +

+ +

+ +

+
+ +
+ +

+ +

+ + +

+ +

+
+ +
+
+

+ +

+ + +

+ +

+
+ +
+
+

+ +

+ + +

+ +

+
+ +
+
+

+ +

+ +

+ +

+ +

+ +

+
+ +
+
+

+ +

+
); }; diff --git a/src/constants/localization/main/en.ts b/src/constants/localization/main/en.ts index 9df83e6..592acd1 100644 --- a/src/constants/localization/main/en.ts +++ b/src/constants/localization/main/en.ts @@ -4,5 +4,23 @@ export const main: Record = { "main.info": "Info", "main.saveTheLink": "Save the link", "main.welcome": "Tervetuloa! Welcome! Vitajte!", - "main.toBeDecided": "To be specified" + "main.toBeDecided": "To be specified", + + "main.info.seurantalo": "Wedding is located in Naantali on Livonsaari: Velkuantie 987, 21180 Livonsaari", + + "main.info.accomodation": "Accomodation", + + "main.info.vanhaSalakuljettaja": "Old Smuggler", + "main.info.vanhaSalakuljettaja.desc": "Old Smugglerr offers cabin to rent approximately 7km from the wedding place.", + + "main.info.vaihela": "Archipelago hotel Vaihela", + "main.info.vaihela.desc": "On excellent location. Expensive but idyllic. Behind two ferries.", + + "main.info.livonsaariCaravan": "Livonsaari Caravan", + "main.info.livonsaariCaravan.desc": "Nearest to the wedding place (approx 4km). Simple and functional", + + "main.info.livonsaarenOsuuskauppa": "Livonaaren Osuuskauppa", + "main.info.livonsaarenOsuuskauppa.desc": "Best village shop ever! Right on the other side of the road from the wedding place. Here you can find grosery, restaurant and a bar.", + + "main.info.services": "Other services", } \ No newline at end of file diff --git a/src/constants/localization/main/fi.ts b/src/constants/localization/main/fi.ts index c5ec573..560ceec 100644 --- a/src/constants/localization/main/fi.ts +++ b/src/constants/localization/main/fi.ts @@ -4,5 +4,23 @@ export const main: Record = { "main.info": "Info", "main.saveTheLink": "Laita linkki talteen", "main.welcome": "Tervetuloa! Welcome! Vitajte!", - "main.toBeDecided": "Selviää myöhemmin" + "main.toBeDecided": "Selviää myöhemmin", + + "main.info.seurantalo": "Juhlapaikka sijaitsee Naantalissa Livonsaarella osoitteessa: Velkuantie 987, 21180 Livonsaari", + + "main.info.accomodation": "Majoitus", + + "main.info.vanhaSalakuljettaja": "Vanha Salakuljettaja", + "main.info.vanhaSalakuljettaja.desc": "Vanha Salakuljettaja tarjoaa aittamajoitusta vilkaan vierasvenesataman vieressä noin 7km juhlapaikalta.", + + "main.info.vaihela": "Saaristohotelli Vaihela", + "main.info.vaihela.desc": "Majoitus todella hienolla paikalla. Hintava, mutta idyllinen. Sijaitsee kahden lossin takana.", + + "main.info.livonsaariCaravan": "Livonsaari Caravan", + "main.info.livonsaariCaravan.desc": "Lähimpänä juhlapaikkaa (noin 4km). Konstailematon ja käytännöllinen.", + + "main.info.livonsaarenOsuuskauppa": "Livonaaren Osuuskauppa", + "main.info.livonsaarenOsuuskauppa.desc": "Paras kyläkauppa koskaan! Heti tien toisella puolella juhlapaikasta katsottuna. Täältä löytyy peruselintarvikkeita, ravintola ja baari.", + + "main.info.services": "Muita palveluita", } \ No newline at end of file diff --git a/src/img/kauppa.jpg b/src/img/kauppa.jpg new file mode 100644 index 0000000..8a1173b Binary files /dev/null and b/src/img/kauppa.jpg differ diff --git a/src/img/lintujamaslo.jpg b/src/img/lintujamaslo.jpg deleted file mode 100644 index 9fb37bf..0000000 Binary files a/src/img/lintujamaslo.jpg and /dev/null differ diff --git a/src/img/livonsaariCaravan.jpg b/src/img/livonsaariCaravan.jpg new file mode 100644 index 0000000..45988ba Binary files /dev/null and b/src/img/livonsaariCaravan.jpg differ diff --git a/src/img/seurantalo.jpg b/src/img/seurantalo.jpg new file mode 100644 index 0000000..a5070c2 Binary files /dev/null and b/src/img/seurantalo.jpg differ diff --git a/src/img/vaihela.jpg b/src/img/vaihela.jpg new file mode 100644 index 0000000..3d1d23b Binary files /dev/null and b/src/img/vaihela.jpg differ diff --git a/src/img/vanhaSalakuljettaja.jpg b/src/img/vanhaSalakuljettaja.jpg new file mode 100644 index 0000000..8636270 Binary files /dev/null and b/src/img/vanhaSalakuljettaja.jpg differ diff --git a/src/pages/Main.scss b/src/pages/Main.scss index 08fef8d..083b9bb 100644 --- a/src/pages/Main.scss +++ b/src/pages/Main.scss @@ -15,6 +15,7 @@ border-radius: 300px; padding-right: 10rem; padding-left: 10rem; + max-width: 50%; .logo-container { margin-top: 3rem; @@ -66,6 +67,7 @@ padding-right: 2rem; padding-left: 2rem; width: 90%; + max-width: unset; .Main-title { line-height: 2rem;