Merge branch 'master' into 'production'
Merge 'master' into 'prod' See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!106
This commit is contained in:
@@ -54,16 +54,6 @@ const ActualPageHero: React.FC = () => (
|
|||||||
linkText="Ulkoiset suhteet ›"
|
linkText="Ulkoiset suhteet ›"
|
||||||
/>
|
/>
|
||||||
</HeroAside>
|
</HeroAside>
|
||||||
|
|
||||||
<HeroSecondarySection
|
|
||||||
heading="Kiltahuone sijaitsee Tuas-talossa (Maarintie 8)"
|
|
||||||
>
|
|
||||||
<HeroSecondarySectionItem note="To">
|
|
||||||
<span>
|
|
||||||
Kiltapäiväkerho Kiltis kokoontuu <strong>torstaisin kiltahuoneella.</strong>. Lämpimästi tervetuloa kaikki SIKkiläiset ja SIK-mieliset!
|
|
||||||
</span>
|
|
||||||
</HeroSecondarySectionItem>
|
|
||||||
</HeroSecondarySection>
|
|
||||||
|
|
||||||
</Hero>
|
</Hero>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -11,11 +11,6 @@ const FreshmenPageHero: React.FC = () => (
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<HeroAside bgColor="lightTurquoise">
|
<HeroAside bgColor="lightTurquoise">
|
||||||
<HeroAsideItem
|
|
||||||
header="Lue killan fuksiopas"
|
|
||||||
link="https://static.sahkoinsinoorikilta.fi/FTMK/Fuksiopas2021.pdf"
|
|
||||||
linkText="lue fuksiopas täältä!"
|
|
||||||
/>
|
|
||||||
<HeroAsideItem
|
<HeroAsideItem
|
||||||
header="Seuraa killan tiedotusta"
|
header="Seuraa killan tiedotusta"
|
||||||
link="https://t.me/joinchat/rKg3rCtAVkkyNTdk"
|
link="https://t.me/joinchat/rKg3rCtAVkkyNTdk"
|
||||||
|
|||||||
@@ -71,13 +71,6 @@ const SponsorReel = styled.div`
|
|||||||
const FrontPageView: React.FC<FrontPageViewProps> = ({ events, feed }) => (
|
const FrontPageView: React.FC<FrontPageViewProps> = ({ events, feed }) => (
|
||||||
<>
|
<>
|
||||||
<FrontPageHero />
|
<FrontPageHero />
|
||||||
<CTASection
|
|
||||||
bgColor="sik100Blue"
|
|
||||||
link="https://sik100.fi"
|
|
||||||
linkText="Mikä ihmeen SIK100? ›"
|
|
||||||
>
|
|
||||||
SIK100
|
|
||||||
</CTASection>
|
|
||||||
<main>
|
<main>
|
||||||
|
|
||||||
<Events events={events} lang="fi" />
|
<Events events={events} lang="fi" />
|
||||||
|
|||||||
Reference in New Issue
Block a user