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
16 changes: 12 additions & 4 deletions src/components/BlogPage/BlogArticle/BlogArticle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,16 @@

p {
margin-bottom: 15px;
font-size: 12px;
line-height: 18px;
font-size: 14px;
line-height: 24px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;

em {
font-size: 14px;
}
}
}

Expand Down Expand Up @@ -76,10 +80,14 @@
font-size: $large;
}

p,
p,
a {
font-size: 16px;
font-size: 18px;
line-height: 30px;

em {
font-size: 18px;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/BlogPage/BlogContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const Blog = () => {
)}
{data?.map((article, idx) => (
<BlogGrid key={idx} title={article.name}>
{article?.articles?.map((item, idx) => (
{article?.article?.map((item, idx) => (
<BlogArticle
key={idx}
image={item.image}
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useBlog.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const useBlog = () => {
allStrapiBlogCategory {
nodes {
name
articles {
article {
title
summary
slug
Expand Down
8 changes: 4 additions & 4 deletions src/hooks/useEdTech.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ const useEdTech = () => {
title
content
icon {
localFile {
childImageSharp {
gatsbyImageData(height: 100)
}
localFile {
childImageSharp {
gatsbyImageData(height: 100, quality: 100)
}
}
}
edTechSubmodules {
ed_tech_submodules {
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useEdTechSubmodules.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const useEdTechSubmodules = () => {
logo {
localFile {
childImageSharp {
gatsbyImageData(width: 60)
gatsbyImageData(width: 60, quality: 100)
}
}
}
Expand All @@ -27,7 +27,7 @@ const useEdTechSubmodules = () => {
icon {
localFile {
childImageSharp {
gatsbyImageData(width: 60)
gatsbyImageData(width: 60, quality: 100)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useServices.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const useServices = () => {
icon {
localFile {
childImageSharp {
gatsbyImageData(width: 150, quality: 100, placeholder: BLURRED)
gatsbyImageData(width: 150, quality: 100)
}
}
}
Expand Down
21 changes: 17 additions & 4 deletions src/templates/BlogItemDetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import showdown from "showdown"
import Layout from "../components/layout"
import { Seo } from "../components/index.js"
import { BannerTop } from "../components/index.js"
// import { getImage, GatsbyImage } from "gatsby-plugin-image"
import { getImage, GatsbyImage } from "gatsby-plugin-image"
import "./BlogItemDetail.scss"

const BlogDetail = ({ data }) => {
const { title, description, image } = data?.allStrapiArticle?.nodes[0]
const { title, description, image, author } = data?.allStrapiArticle?.nodes[0]
const bannerTop = { title, image }

let { summary } = author
let converter = new showdown.Converter()
let html = converter.makeHtml(description)

Expand All @@ -26,7 +27,7 @@ const BlogDetail = ({ data }) => {
<div className="col-lg-12">
<div className="detail__description">
<p dangerouslySetInnerHTML={ReplaceHtml()} />
{/* <div className="detail__description-author">
<div className="detail__description-author">
{author?.map(author => (
<div className="detail__box-author">
<div className="detail__box-author-image">
Expand All @@ -42,7 +43,7 @@ const BlogDetail = ({ data }) => {
</div>
</div>
))}
</div> */}
</div>
</div>
</div>
{/* <div className="col-lg-4">
Expand Down Expand Up @@ -80,6 +81,18 @@ export const query = graphql`
}
}
}
author {
name
subTitle
summary
image {
localFile {
childImageSharp {
gatsbyImageData
}
}
}
}
}
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/templates/BlogItemDetail.scss
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
margin: 10px auto;
border-radius: 50%;
object-fit: cover;
box-shadow: none;
}
}

Expand All @@ -137,7 +138,7 @@
}

p {
font-size: 13px;
font-size: $small;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
Expand Down Expand Up @@ -183,7 +184,7 @@
margin: 1rem 0;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
-webkit-line-clamp: 5;
overflow: hidden;
font-size: $small;
}
Expand Down Expand Up @@ -251,8 +252,8 @@
text-align: center;

img {
width: 145px;
height: 145px;
width: 175px;
height: 150px;
}
}

Expand Down Expand Up @@ -322,8 +323,8 @@
}

p {
font-size: 13px;
line-height: 20px;
font-size: 16px;
line-height: 24px;
}
}

Expand Down