From 127d771e75490297a00342fa2e11b44029d5ef1c Mon Sep 17 00:00:00 2001 From: benjacanas Date: Tue, 12 Apr 2022 12:07:50 -0300 Subject: [PATCH] banner list cambios --- src/components/BannerList/Banner.scss | 13 ++++++ src/components/BannerList/BannerLis.js | 19 +++++---- src/components/Text/Text.js | 57 ++++++++++++++------------ src/components/Text/Text.scss | 8 ++-- src/context/themeContext.js | 2 +- 5 files changed, 62 insertions(+), 37 deletions(-) diff --git a/src/components/BannerList/Banner.scss b/src/components/BannerList/Banner.scss index 27ed8d1d..8370cc38 100644 --- a/src/components/BannerList/Banner.scss +++ b/src/components/BannerList/Banner.scss @@ -7,13 +7,26 @@ text-align: justify; margin: 0 !important; } + a{ + color: inherit; + } img { width: 48px; } } &__title { + display: flex; + flex-direction: column; font-weight: 700; text-align: left; + button{ + margin-top: 30px; + @include primaryBtn; + align-self: baseline; + a{ + color: inherit; + } + } } } diff --git a/src/components/BannerList/BannerLis.js b/src/components/BannerList/BannerLis.js index 0d93afed..2c272821 100644 --- a/src/components/BannerList/BannerLis.js +++ b/src/components/BannerList/BannerLis.js @@ -1,10 +1,11 @@ +import { Link } from "gatsby" import React from "react" import "./Banner.scss" export default function BannerLis({ data }) { const title = data?.title const image = data?.Card[0]?.icon?.url - + console.log(data) const cards = data?.Card.map(item => { return (
@@ -12,7 +13,9 @@ export default function BannerLis({ data }) {
-

{item.title}

+ +

{item.title}

+

{item.description}

@@ -20,15 +23,17 @@ export default function BannerLis({ data }) { }) return ( -
+
+
{cards}

{title} + {data.contactForm && ( + + )}

-
{cards}
) diff --git a/src/components/Text/Text.js b/src/components/Text/Text.js index fa0ea5a3..56fe13e4 100644 --- a/src/components/Text/Text.js +++ b/src/components/Text/Text.js @@ -3,32 +3,37 @@ import MarkdownView from "react-showdown" import "./Text.scss" export default function Text({ data }) { - const title = data?.title - const description = data?.text - const bgImage = data?.backgroundImage?.url + const title = data?.title + const description = data?.text + const bgImage = data?.backgroundImage?.url - return ( -
- {title !== "" && title !== undefined && title !== null ? ( -
-
-

{title}

-
- -
- ) : ( - - )} + return ( +
+ {title !== "" && title !== undefined && title !== null ? ( +
+
+

{title}

+
+
- ) + ) : ( + + )} +
+ ) } diff --git a/src/components/Text/Text.scss b/src/components/Text/Text.scss index f5fd77a4..ad870e48 100644 --- a/src/components/Text/Text.scss +++ b/src/components/Text/Text.scss @@ -1,7 +1,8 @@ @import "../../styles/global.scss"; .text { - margin-bottom: 50px; + color: $primary; + padding-bottom: 50px; .title { text-transform: uppercase; width: 100%; @@ -43,13 +44,14 @@ } #descriptionText { + color: $primary; height: 70vh; - margin-bottom: 50px; + padding-bottom: 50px; display: flex; align-items: center; p { - background-color: #ffffff; + background-color: $primary-container; padding: 2em 1em; margin: 1em 1em 0; border-radius: 20px; diff --git a/src/context/themeContext.js b/src/context/themeContext.js index 55fee4e7..7d6b9a23 100644 --- a/src/context/themeContext.js +++ b/src/context/themeContext.js @@ -8,7 +8,7 @@ const themes = { "--primary": "#000000", "--primary-invert": "#ffffff", "--primary-hover": "#000000", - "--primary-container": "#ffffff", + "--primary-container": "#faf8f8", "--title-jobs": "#5682c6", "--jobs-hover": "#f0f0f0",