Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
b611722
modificar margenes entre parrafos
drina-bitlogic Apr 18, 2022
219717f
Merge pull request #160 from bitlogic/SBIT-103
marino-martin Apr 18, 2022
9d5c6d4
fuente darkmode logos
benjacanas Apr 19, 2022
affb4cc
navbar fixes
benjacanas Apr 19, 2022
ab5a403
boton oneSection y componente para links en botones
benjacanas Apr 19, 2022
4656ed6
SBIT-95: se agregan estilos de banner diagonales
darioviada-bitlogic Apr 19, 2022
7cc486c
Merge branch 'dev' into SBIT-95
darioviada-bitlogic Apr 19, 2022
7b4e4a1
boton navbar
benjacanas Apr 20, 2022
ce6c44f
featuredBlog landing
benjacanas Apr 20, 2022
e5d4798
ids
benjacanas Apr 20, 2022
52e94da
-console
benjacanas Apr 20, 2022
6e52431
featuredBlog dropdown
benjacanas Apr 20, 2022
13c58c2
titulo no definido
benjacanas Apr 20, 2022
16e78a0
expandedgrid scroll y background
benjacanas Apr 20, 2022
2edf057
code smell
benjacanas Apr 20, 2022
354b62b
Merge pull request #162 from bitlogic/SBIT-109
marino-martin Apr 20, 2022
d66dfe9
-console
benjacanas Apr 20, 2022
9cbcac8
Merge pull request #161 from bitlogic/SBIT-108
marino-martin Apr 20, 2022
85ac796
Merge pull request #163 from bitlogic/SBIT-105
marino-martin Apr 20, 2022
c7f56e2
Merge pull request #165 from bitlogic/SBIT-96
marino-martin Apr 20, 2022
4b05de5
code smell
benjacanas Apr 20, 2022
01e1853
Merge pull request #164 from bitlogic/SBIT-110
marino-martin Apr 20, 2022
e92ff19
se quita bannerHead de blog
darioviada-bitlogic Apr 20, 2022
ed406a1
merge dev
darioviada-bitlogic Apr 20, 2022
3ad7a0f
Merge pull request #166 from bitlogic/SBIT-95
marino-martin Apr 20, 2022
eaec1ab
Se cambia componente banner en blogpage
darioviada-bitlogic Apr 20, 2022
9c46384
merge dev
darioviada-bitlogic Apr 20, 2022
3a3caa1
Merge pull request #167 from bitlogic/SBIT-95
marino-martin Apr 20, 2022
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
5 changes: 0 additions & 5 deletions public/page-data/index/page-data.json

This file was deleted.

36 changes: 27 additions & 9 deletions src/components/Banner/Banner.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
import React from "react"
import { Link } from "gatsby"
import ReactMarkdown from "react-markdown"
import { useTheme } from "../../context/themeContext"

import "./Banner.scss"

const Banner = ({ data }) => {
const { theme } = useTheme()
const title = data?.title
const variant = data?.variant
const summary = data?.summary
const image = data?.image
const imageDark = data?.imageDark
const button = data?.button
const id = data?.id
const diagonalReverseState =
variant === "diagonalReverse" ? "col-md-4" : "col-md-6"
return (
<div className={`banner ${variant}`} id={id}>
<div className="title container">
<div className="col-12 col-md-6">
<h1>{title}</h1>
<h3>{summary}</h3>
<div
className={`banner ${variant}`}
id={data.strapi_component + "-" + data.id}
>
<div className="title container-md">
<div className="col-12 col-lg-6">
{variant === "hero" ? <h1>{title}</h1> : <h2>{title}</h2>}
{/* <h3>{summary}</h3> */}
<ReactMarkdown source={summary} className="banner-markdown" />
{button &&
(button?.landing_page ? (
<Link to={`../${button.landing_page.slug}`} className="button">
Expand All @@ -32,9 +42,17 @@ const Banner = ({ data }) => {
))}
</div>
</div>

<div className="imagen col-12 col-md-6">
<img src={image?.url} alt={title} />

<div
className={`imagen col-12 ${
variant === "diagonal" ? "col-md-8" : diagonalReverseState
} `}
>
{/* <img src={image?.url} alt={title} /> */}
<img
src={theme === "dark" && imageDark ? imageDark?.url : image?.url}
alt={title}
/>
</div>
</div>
)
Expand Down
166 changes: 145 additions & 21 deletions src/components/Banner/Banner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@
.title {
h1 {
text-transform: uppercase;
text-align: left;
margin-bottom: 0.8rem;
word-wrap: initial;
}
h3 {
font-weight: 400;
text-align: left;
}
}
}
Expand All @@ -42,30 +49,65 @@
.imagen {
display: flex;
justify-content: flex-end;
img {
max-width: 450px;
}
}
.title {
padding-top: 2rem;
padding-bottom: 2rem;
h2 {
text-transform: uppercase;
text-align: center;
word-wrap: initial;
}
h3 {
display: none;
}
}
}
&.topReverse {
height: auto;
justify-content: end;
.button {
@include primaryBtn;
margin-top: 20px;
margin-bottom: 20px;
display: inline-block;
}
.imagen {
display: flex;
justify-content: flex-start;
img {
width: 100%;
max-width: 450px;
}
}
.title {
padding-top: 2rem;
h1 {
padding-bottom: 2rem;
h2 {
text-transform: uppercase;
text-align: center;
word-wrap: initial;
}
h3 {
display: none;
}
}
}
&.diagonal {
height: auto;
min-height: 300px;
justify-content: end;
background-color: #f2f0f7;
background-color: $bg-diagonal;
.button {
margin-top: 20px;
margin-bottom: 20px;
display: inline-block;
font-weight: 600;
color: #607ee7;
text-decoration: underline;
padding-left: 5px;
}
.imagen {
display: flex;
Expand All @@ -76,10 +118,12 @@
}
.title {
padding-top: 2rem;
h1 {
padding-bottom: 2rem;
h2 {
text-transform: uppercase;
color: #607ee7;
margin-bottom: 0;
word-wrap: initial;
}
h3 {
display: none;
Expand All @@ -90,25 +134,32 @@
&.diagonalReverse {
height: auto;
justify-content: end;
background-color: #f2f0f7;

.button {
margin-top: 20px;
margin-bottom: 20px;
display: inline-block;
color: #607ee7;
text-decoration: underline;
padding-left: 5px;
}
.imagen {
display: flex;
justify-content: flex-end;
justify-content: center;
align-items: center;
img {
width: 100%;
max-width: 200px;
}
}
.title {
padding-top: 2rem;
h1 {
padding-bottom: 2rem;
background-color: $bg-diagonal;
h2 {
text-transform: uppercase;
color: #607ee7;
margin-bottom: 0;
word-wrap: initial;
}
h3 {
display: none;
Expand All @@ -119,6 +170,23 @@
.gatsby-image-wrapper {
display: block;
}
.banner-markdown{
font-size: 30px;
h1,h2,h3,h4,h5,h6{
font-size: 32px;
font-weight: 600;
margin-bottom: 0;
}
p , a, span, small, li, i, em{
span, strong, small, i, b, em {
font-size: 30px;
}
font-size: 30px;
}
strong, b {
font-weight: 600;
}
}

@media screen and (min-width: $breakpoint-md) {
flex-direction: row;
Expand Down Expand Up @@ -158,18 +226,18 @@
padding: 0;
justify-content: flex-end;
img {
width: 100%;
max-width: 600px;
}
}

.title {
position: absolute;
padding-top: 0;
padding-bottom: 0;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
h1 {
h2 {
margin-bottom: 1rem;
padding-right: 3rem;
text-align: left;
Expand All @@ -180,41 +248,43 @@
}
}
}
&.diagonal {
&.topReverse {
height: 400px;
position: relative;
align-items: center;
flex-direction: row-reverse;
.imagen {
height: 500px;
max-height: 500px;
overflow: hidden;
padding: 0;
justify-content: flex-end;
img {
width: 100%;
max-width: 600px;
}
}

.title {
position: absolute;
padding-top: 0;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
h1 {
padding-bottom: 0;
flex-direction: row-reverse;
h2 {
margin-bottom: 1rem;
padding-right: 3rem;
text-align: left;
}
h3 {
font-weight: 400;
padding-right: 3rem;
}
}
}
&.diagonalReverse {
height: 400px;
&.diagonal {
height: 300px;
position: relative;
align-items: center;
.imagen {
-webkit-clip-path: polygon(17% 0, 100% 0, 100% 55%, 91% 100%, 0 100%);
clip-path: polygon(17% 0, 100% 0, 100% 55%, 91% 100%, 0 100%);
height: 500px;
overflow: hidden;
padding: 0;
Expand All @@ -227,18 +297,72 @@
.title {
position: absolute;
padding-top: 0;
padding-bottom: 0;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
h1 {

h2 {
margin-bottom: 1rem;
padding-right: 3rem;
max-width: 400px;
}
h3 {
font-weight: 400;
padding-right: 3rem;
}
}
}
&.diagonalReverse {
height: 300px;
position: relative;
align-items: center;
justify-content: flex-start;
flex-direction: row-reverse;
.imagen {
height: 500px;
overflow: hidden;
padding: 0;
justify-content: flex-end;
}
.button {
padding-left: 5rem;
}
.title {
background-color: $bg-diagonal;
-webkit-clip-path: polygon(0 0, 92% 0, 100% 45%, 100% 100%, 17% 100%);
clip-path: polygon(0 0, 92% 0, 100% 45%, 100% 100%, 17% 100%);
display: flex;
justify-content: flex-end;
flex-direction: row-reverse;
height: 100%;
align-items: center;
h2 {
margin-bottom: 1rem;
padding-left: 5rem;
}
h3 {
font-weight: 400;
padding-left: 5rem;
}
}
}
}
@media screen and (min-width: $breakpoint-lg) {
&.diagonal {
height: 400px;
}
&.diagonalReverse {
height: 400px;
.title {
h2 {
padding-left: 10rem;
}
}
.button {
padding-left: 10rem;
}
}

}
}
14 changes: 9 additions & 5 deletions src/components/BlogPage/BlogArticle/BlogArticle.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ import "./BlogArticle.scss"
const BlogArticle = ({ title, summary, image, slug, text }) => {
return (
<div className="article__container">
<GatsbyImage
image={getImage(image?.localFile)}
alt={title}
className="article__image"
/>
{image?.localFile ? (
<GatsbyImage
image={getImage(image?.localFile)}
alt={title}
className="article__image"
/>
) : (
<img src={image?.url} alt={title} className="article__image" />
)}
<div className="article__description">
<h6>{`${title} ...`}</h6>
<div>
Expand Down
Loading