Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions src/templates/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import EventNav from '../components/EventNav';
import HeroText from '../styles/HeroText';
import ImageEventItem from '../components/ImageEventItem';
import WorkHomePage from '../components/WorkHomePage';
import MarkdownView from 'react-showdown';
import Seo from '../components/Seo/Seo';
import useFixedScroll from '../hooks/useFixedScroll';
import MainContainer from '../styles/MainContainer';
Expand All @@ -23,6 +24,18 @@ const EventInfo = styled.div`
display: none;
}

.description p {
margin: 0 0 1em;
}

.description a {
display: inline;
width: auto;
margin-top: 0;
font-size: inherit;
line-height: inherit;
}

@media (min-width: 1024px) {
a {
width: 200px;
Expand Down Expand Up @@ -83,9 +96,7 @@ const EventTemplate = ({ data }) => {
<EventLabel color={data.markdownRemark.frontmatter.color}>
{data.markdownRemark.frontmatter.name}
</EventLabel>
<p className="description">
{data.markdownRemark.frontmatter.description}
</p>
<MarkdownView className="description" markdown={data.markdownRemark.frontmatter.description || ''} />
</EventInfo>
</TitleContainer>
<EventsContent ref={rightContainerRef}>
Expand Down
13 changes: 12 additions & 1 deletion src/templates/eventdetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,15 @@ const SummaryText = styled.div`
font-size: 1.5rem;
margin-top: 24px;

p {
margin: 0;
}

a {
color: #05b7be;
text-decoration: none;
}

@media (min-width: 1280px) {
font-size: 2rem;
}
Expand Down Expand Up @@ -298,7 +307,9 @@ const EventDetailTemplate = ({ data }) => {
<EventDetailContent ref={rightContainerRef}>
<ImageSection>
<Image fluid={eventdetail.frontmatter.image.childImageSharp.fluid} />
<SummaryText>{eventdetail.frontmatter.summary}</SummaryText>
<SummaryText>
<MarkdownView markdown={eventdetail.frontmatter.summary || ''} />
</SummaryText>
</ImageSection>
<EventDetailText>
<p>Context:</p>
Expand Down
13 changes: 12 additions & 1 deletion src/templates/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ const SummaryText = styled.div`
font-size: 1.5rem;
margin-top: 24px;

p {
margin: 0;
}

a {
color: #05b7be;
text-decoration: none;
}

@media (min-width: 1280px) {
font-size: 2rem;
}
Expand Down Expand Up @@ -340,7 +349,9 @@ const ProjectTemplate = ({ data }) => {
<ProjectContent ref={rightContainerRef}>
<ImageSection>
<Image fluid={project.frontmatter.image.childImageSharp.fluid} />
<SummaryText>{project.frontmatter.summary}</SummaryText>
<SummaryText>
<MarkdownView markdown={project.frontmatter.summary || ''} />
</SummaryText>
</ImageSection>
<ProjectText>
<p>Context:</p>
Expand Down
15 changes: 14 additions & 1 deletion src/templates/sector.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import HeroText from '../styles/HeroText';
import ImageItem from '../components/ImageItem';
import WorkHomePage from '../components/WorkHomePage';
import MiniTeamSection from '../components/MiniTeamSection';
import MarkdownView from 'react-showdown';
import Seo from '../components/Seo/Seo';
import useFixedScroll from '../hooks/useFixedScroll';
import MainContainer from '../styles/MainContainer';
Expand All @@ -25,6 +26,18 @@ const SectorInfo = styled.div`
display: none;
}

.description p {
margin: 0 0 1em;
}

.description a {
display: inline;
width: auto;
margin-top: 0;
font-size: inherit;
line-height: inherit;
}

@media (min-width: 1024px) {
a {
width: 200px;
Expand Down Expand Up @@ -83,7 +96,7 @@ const SectorTemplate = ({ data }) => {
<SectorLabel color={data.markdownRemark.frontmatter.color}>
{data.markdownRemark.frontmatter.name}
</SectorLabel>
<p className="description">{data.markdownRemark.frontmatter.description}</p>
<MarkdownView className="description" markdown={data.markdownRemark.frontmatter.description || ''} />
{/* <a href="#">View All {data.markdownRemark.frontmatter.name} Case Studies</a> */}
</SectorInfo>
</TitleContainer>
Expand Down
Loading
Loading