Skip to content

SBIT-100: fixes one-section #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2022
Merged

SBIT-100: fixes one-section #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 22 additions & 17 deletions src/components/DualSection/DualSection.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@
}
}


.one_sec {
color: $primary;
&-background{
background-size: cover;
background-repeat: no-repeat;
padding: 1em 0 0 0;
}
display: flex;
flex-direction: row;
justify-content: space-around;
align-items: center;
gap: 3em;
padding: 3em 0;
button {
background: $light-grey;
color: white;
font-weight: 500;
border-radius: 3px;
border: none;
padding: 0.3em;
a{
@include primaryBtn;
a {
color: inherit;
}
}
Expand All @@ -51,30 +51,35 @@
display: block;
}

&-title{
&-title {
flex-basis: 45%;
h3{
font-weight: 400;
h3 {
font-weight: 700;
font-size: 36px;
line-height: 40px;
}
&-body{
font-weight: 400 !important;
}
}

&-img{
&-img {
flex-basis: 55%;
img{
img {
width: 100%;
padding: 0 0 0 3em;
padding: 0;
}
}

@media screen and (max-width: $breakpoint-xl) {
flex-direction: column-reverse;
&-img{
&-img {
flex-basis: 100%;
}
&-title{
&-title {
padding: 0 10vw;
flex-basis: 100%;
}
}

}

52 changes: 35 additions & 17 deletions src/components/DualSection/OneSection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,43 @@
import React from "react"
import { useTheme } from "../../context/themeContext"

const OneSection = ({ data: { id, strapi_component, dualSectionPart } }) => {
const { title, button, description, image } = dualSectionPart
? dualSectionPart[0]
: {}
const { theme } = useTheme()
const {
title,
button,
description,
image,
backgroundImage,
backgroundImageDark,
} = dualSectionPart ? dualSectionPart[0] : {}

return (
<div className="one_sec container" id={strapi_component + "-" + id}>
<div className="one_sec-title">
<h1>{title}</h1>
<p>{description}</p>
{button && (
<button>
<a href={button.url} target="_blank" rel="noreferrer">
{button.content}
</a>
</button>
)}
</div>
<div className="one_sec-img">
<img src={image?.url} alt="one_sec" />
<div
className="one_sec-background"
style={{
backgroundImage: `url(${
theme === "dark" && backgroundImageDark?.url
? backgroundImageDark?.url
: backgroundImage?.url
})`,
}}
>
<div className="one_sec container" id={strapi_component + "-" + id}>
<div className="one_sec-title">
<h3>{title}</h3>
<h3 className="one_sec-title-body">{description}</h3>
{button && (
<button>
<a href={button.url} target="_blank" rel="noreferrer">
{button.content}
</a>
</button>
)}
</div>
<div className="one_sec-img">
<img src={image?.url} alt="one_sec" />
</div>
</div>
</div>
)
Expand Down
4 changes: 4 additions & 0 deletions src/context/themeContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ const themes = {
"--nav-footer-container": "#2a2c2e",
"--blog-card-container": "#f5f5f5",
"--primary": "#000000",
"--primary-invert": "#ffffff",
"--primary-hover": "#000000",
"--primary-container": "#ffffff",
"--title-jobs": "#5682c6",
"--jobs-hover": "#f0f0f0",

"--secondary": "#3f6be8",
"--secondary-container": "#25cad3",
"--border-bottom": "#cdcdcd",
},
Expand All @@ -19,12 +21,14 @@ const themes = {
"--blog-card-container": "#383838",

"--primary": "#ffffff",
"--primary-invert": "#000000",
"--primary-hover": "#000000",
"--primary-container": "#292929",
"--border-bottom": "#565656",
"--title-jobs": "#1ecad3",
"--jobs-hover": "#8383833b",

"--secondary": "#67f293",
"--secondary-container": "#191919",
},
}
Expand Down
2 changes: 1 addition & 1 deletion src/images/moon-solid.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 7 additions & 9 deletions src/styles/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ $nav-footer-container: var(--nav-footer-container);
$blog-card-container: var(--blog-card-container);

$primary: var(--primary);
$primary-invert: var(--primary-invert);
$primary-hover: var(--primary-hover);
$primary-container: var(--primary-container);

Expand All @@ -18,6 +19,8 @@ $border-bottom: var(--border-bottom);
$title-jobs: var(--title-jobs);
$jobs-hover: var(--jobs-hover);



main {
background-color: $primary-container !important;
}
Expand Down Expand Up @@ -51,7 +54,6 @@ $grey-light: #f5f5f5;
//new colors
$grey: #545468;
$light-grey: #c4c4c4;
$primary: #3f6be8;
$alt: #67f293;
$blackBit: #242424;

Expand All @@ -67,18 +69,14 @@ $extra-large: 45px;
padding: 5px 15px;
font-weight: 500;
border: none;
background-color: $primary;
color: white;
background-color: $secondary;
color: $primary-invert;
border-radius: 5px;
transition: filter 200ms ease-in;
&:hover {
background-color: #b2c4f6;
color: #3c6ed0;
filter: brightness(135%);
box-shadow: 0px 3px 10px rgba(138, 254, 113, 0.5);
}
&:active {
background-color: #2a50bc;
color: white;
}
@media screen and (min-width: $breakpoint-lg) {
padding: 8px 30px;
}
Expand Down