diff --git a/public/page-data/index/page-data.json b/public/page-data/index/page-data.json index dbdcdb3a..19e417a7 100644 --- a/public/page-data/index/page-data.json +++ b/public/page-data/index/page-data.json @@ -2,4 +2,4 @@ "componentChunkName": "component---src-pages-index-js", "path": "/", "result": {"pageContext":{}}, - "staticQueryHashes": ["1128713364","1693928026","176670904","1886264361","2898073905","3206133181","4006044966"]} \ No newline at end of file + "staticQueryHashes": ["1128713364","176670904","1886264361","2898073905","3206133181","4006044966","943162249"]} \ No newline at end of file diff --git a/src/components/BannerHead/BannerHead.js b/src/components/BannerHead/BannerHead.js index 910766b9..75ddab17 100644 --- a/src/components/BannerHead/BannerHead.js +++ b/src/components/BannerHead/BannerHead.js @@ -2,31 +2,43 @@ import React from "react" import "./BannerHead.scss" import MarkdownView from "react-showdown" import { getImage, GatsbyImage } from "gatsby-plugin-image" +import { useTheme } from "../../context/themeContext" const BannerHead = ({ data }) => { - const title = data?.title; + const { theme } = useTheme() - const checkImage = () => { + const title = data?.title - if (data?.image?.url) { - return {data?.image?.name} - } else { - const image = getImage(data?.image?.localFile) - return - } + const checkImage = () => { + if (data?.image?.url) { + return ( + {data?.image?.name} + ) + } else { + const image = getImage(data?.image?.localFile) + const imageDark = data?.imageDark && getImage(data?.imageDark?.localFile) + return ( + + ) } + } - return ( - - ) + return ( + + ) } export default BannerHead diff --git a/src/components/BannerHead/BannerHead.scss b/src/components/BannerHead/BannerHead.scss index 91fce2c8..9009e4c9 100644 --- a/src/components/BannerHead/BannerHead.scss +++ b/src/components/BannerHead/BannerHead.scss @@ -5,7 +5,7 @@ width: 100%; min-height: 300px; align-items: center; - + color: $primary; h3 { color: $primary; text-align: center; diff --git a/src/components/BannerList/Banner.scss b/src/components/BannerList/Banner.scss index c6cdc0d1..27ed8d1d 100644 --- a/src/components/BannerList/Banner.scss +++ b/src/components/BannerList/Banner.scss @@ -1,6 +1,7 @@ @import "../../styles/global.scss"; .bannerList { + color: $primary; .card_item { p { text-align: justify; diff --git a/src/components/BlogPage/BlogContainer.js b/src/components/BlogPage/BlogContainer.js index ec0310c2..3fee539e 100644 --- a/src/components/BlogPage/BlogContainer.js +++ b/src/components/BlogPage/BlogContainer.js @@ -16,7 +16,6 @@ const Blog = () => { const bannerHead = blogData?.allStrapiBlogPage?.nodes[0]?.bannerHead const filterArticle = data.map(category => dataArticles.filter(article => category.name === article.blog_category.name)) - console.log(bannerHead) const { pageTitle, pageDescription, diff --git a/src/components/CasesSection/CasesSection.scss b/src/components/CasesSection/CasesSection.scss index 60b76c3c..fa14caf1 100644 --- a/src/components/CasesSection/CasesSection.scss +++ b/src/components/CasesSection/CasesSection.scss @@ -1,12 +1,14 @@ @import "../../styles/global.scss"; .casesSection { + color: $primary; h2 { text-align: center; font-weight: 700; } } .case { + color: $primary; --bs-gutter-x: 0 !important; padding: 10px; &__img { diff --git a/src/components/Hero/Hero.scss b/src/components/Hero/Hero.scss index b7560648..2e1cdee6 100644 --- a/src/components/Hero/Hero.scss +++ b/src/components/Hero/Hero.scss @@ -1,5 +1,6 @@ @import "../../styles/global.scss"; .hero { + color: $primary; overflow: hidden; display: flex; flex-direction: row; diff --git a/src/components/HomePage/HomeContainer/HomeContainer.js b/src/components/HomePage/HomeContainer/HomeContainer.js index f4b23d30..1dc38ed5 100644 --- a/src/components/HomePage/HomeContainer/HomeContainer.js +++ b/src/components/HomePage/HomeContainer/HomeContainer.js @@ -45,7 +45,7 @@ const Home = ({ location }) => { {/* Dynamic zone */} {data.allStrapiHome.nodes[0].body.map(component => - bodyComponents[component.strapi_component](component) + bodyComponents[component.strapi_component] ? bodyComponents[component.strapi_component](component) : null )} ) diff --git a/src/components/NavBar/AnimatedNavBar/DropdownContainer/dropdown.scss b/src/components/NavBar/AnimatedNavBar/DropdownContainer/dropdown.scss index d65f2558..01e3864b 100644 --- a/src/components/NavBar/AnimatedNavBar/DropdownContainer/dropdown.scss +++ b/src/components/NavBar/AnimatedNavBar/DropdownContainer/dropdown.scss @@ -1,3 +1,4 @@ +@import "../../../../styles/global.scss"; .dropdown { &_elem { width: 18.5rem; @@ -10,7 +11,7 @@ margin-top: 0; margin-bottom: 1rem; &-inner{ - color: black; + color: $primary; } } } @@ -53,8 +54,9 @@ position: relative; top: -20px; &-background { + filter: brightness(120%); transform-origin: 0 0; - background-color: white; + background-color: $primary-container; border-radius: 4px; overflow: hidden; position: relative; diff --git a/src/components/NavBar/AnimatedNavBar/Navbar/navbarItems.scss b/src/components/NavBar/AnimatedNavBar/Navbar/navbarItems.scss index e018185b..28eb3f8e 100644 --- a/src/components/NavBar/AnimatedNavBar/Navbar/navbarItems.scss +++ b/src/components/NavBar/AnimatedNavBar/Navbar/navbarItems.scss @@ -24,7 +24,7 @@ border: 0; font-size: 18px; padding: 2rem 1.5rem 1.2rem 1.5rem; - color: #1f1d37; + color: $primary; display: flex; justify-content: baseline; @media screen and (max-width: $breakpoint-xl) { @@ -37,10 +37,10 @@ /* position above the dropdown, otherwise the dropdown will cover up the bottom sliver of the buttons */ position: relative; z-index: 2; - &:hover, - &:focus { + &:hover{ opacity: 0.7; outline: none; + color: $secondary; } } &-dropdown_container { diff --git a/src/components/NavBar/NavBar.scss b/src/components/NavBar/NavBar.scss index 23fd2331..cc6a6e08 100644 --- a/src/components/NavBar/NavBar.scss +++ b/src/components/NavBar/NavBar.scss @@ -1,7 +1,7 @@ @import "../../styles/global.scss"; .NavBar { - background-color: white; + background-color: $primary-container; z-index: 10; & > a { margin: 1.5em 0 1em 50px; @@ -44,7 +44,7 @@ .navbar_item-title-active { text-decoration: none; - color: #3f6be8 !important; + color: $secondary !important; } .NavBar_Side { @@ -52,18 +52,8 @@ flex-direction: row; align-items: center; &-contact { + @include primaryBtn; white-space: nowrap; - box-shadow: 0px 2px 10px #3f6be880; - padding: 0.6em; - margin-right: 1em; - background-color: #3f6be8; - color: white; - border: 1px solid #3f6be8; - border-radius: 4px; - &:hover { - background-color: white; - color: #3f6be8; - } } p { color: #1f1d37; diff --git a/src/components/NavBar/Navbar.js b/src/components/NavBar/Navbar.js index c2cfc279..6df1a6dd 100644 --- a/src/components/NavBar/Navbar.js +++ b/src/components/NavBar/Navbar.js @@ -49,7 +49,7 @@ const NavBar = () => { )}
- +