Skip to content

SBIT-90: fix expandedGrid y bannerList #151

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 2 commits into from
Apr 13, 2022
Merged

SBIT-90: fix expandedGrid y bannerList #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c3a03b
arreglos bannerList y expandGrid
benjacanas Apr 13, 2022
231b281
bannerList mobile
benjacanas Apr 13, 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
56 changes: 44 additions & 12 deletions src/components/BannerList/Banner.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,71 @@
.bannerList {
color: $primary;
.card_item {
p {
text-align: justify;
margin: 0 !important;
h4 {
margin: 0;
}
a{
a {
color: inherit;
&:hover {
color: $secondary;
}
}
img {
margin: 0 10px 0 auto;
width: 48px;
}
}
button {
margin-top: 10px;
@include primaryBtn;
align-self: baseline;
a {
color: inherit;
}
}
&__title {
display: flex;
flex-direction: column;
font-weight: 700;
text-align: left;
button{
margin-top: 30px;
@include primaryBtn;
align-self: baseline;
a{
color: inherit;
}
}

@media screen and (min-width: $breakpoint-xl) {
.bannerList {
.card_item {
img {
width: 80px;
}
}
&__buttonMobile{
display: none;
}
}
}

@media screen and (min-width: $breakpoint-xl) {
@media screen and (max-width: $breakpoint-md) {
.bannerList {
&__buttonMobile{
margin-left: 1.5em;
}
&__title {
button {
display: none;
}
}
}
}

@media screen and (min-width: $breakpoint-md) {
.bannerList {
.card_item {
img {
width: 70px;
width: 80px;
}
}
&__buttonMobile{
display: none;
}
}
}
42 changes: 30 additions & 12 deletions src/components/BannerList/BannerLis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,37 @@ 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 (
<div className="card_item d-flex mb-4">
<div className="card_item col-3 mt-3 mt-xl-1">
<img class="mx-auto d-block" src={image} placeholder="blurred" />
</div>
<div className="card_item col-9 ps-2 pe-2">
<Link to={item.landing_page ? "/" + item.landing_page?.slug : null}>
<h4>{item.title}</h4>
</Link>
<p>{item.description}</p>
{item.icon && (
<div className="card_item col-3">
<img class="d-block" src={item.icon?.url} placeholder="blurred" />
</div>
)}
<div
style={!item.icon ? { marginLeft: "2em" } : {}}
className="card_item col-9 ps-2 pe-2"
>
{item.landing_page ? (
<Link to={"/" + item.landing_page?.slug}>
<h4>{item.title}</h4>
<p>{item.description}</p>
</Link>
) : (
<>
<h4>{item.title}</h4>
<p>{item.description}</p>
</>
)}
</div>
</div>
)
})

return (
<div className="container py-5" id={data.strapi_component + "-" + data.id}>
<div className="bannerList d-md-flex flex-row-reverse">
<div className="bannerList__cards col-md-6 col-xl-6 pe-5">{cards}</div>
<div className="bannerList d-md-flex flex-row">
<h1 className="bannerList__title col-md-6 col-xl-6 align-self-center ps-4 mb-4">
{title}
{data.contactForm && (
Expand All @@ -34,6 +43,15 @@ export default function BannerLis({ data }) {
</button>
)}
</h1>
<div className="bannerList__cards col-md-6 col-xl-6 pe-5">{cards}

</div>
{data.contactForm && (
<button className="bannerList__buttonMobile">
<a href={"#" + data.concactFormAnchor}>Contactanos</a>
</button>
)}

</div>
</div>
)
Expand Down
17 changes: 8 additions & 9 deletions src/components/expandGrid/ExpandGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const ListItem = ({ index, onClick, data }) => {
<Flipped inverseFlipId={createCardFlipId(index)}>
<div className="listItemContent">
<div className="listItem-more">
<h4>{data.title}</h4>
<h5>{data.title}</h5>
</div>
<Flipped
flipId={`avatar-${index}`}
Expand Down Expand Up @@ -69,7 +69,7 @@ const ExpandedListItem = ({ index, data, isFirst }) => {
<Flipped inverseFlipId={createCardFlipId(index)}>
<div className="listItemContent-expanded">
<div className="listItem-more-expanded">
<p></p>
<h5>{data.title}</h5>
</div>
<Flipped
flipId={`avatar-${index}`}
Expand All @@ -78,15 +78,14 @@ const ExpandedListItem = ({ index, data, isFirst }) => {
>
<img alt="" src={data.image?.url} className="avatar-expanded" />
</Flipped>
<div

className={"additional-content "}
>
<div style={isFirst ? {opacity: "1"} : {}}>
<div className={"additional-content "}>
<div style={isFirst ? { opacity: "1" } : {}}>
<h4>{data.title}</h4>
<MarkdownView markdown={data.text} />
<div className="additional-content-markdown">
<MarkdownView markdown={data.text} />
</div>
{data.landing_page && (
<Link to={"/" + data.landing_page.slug}>Ver más</Link>
<Link to={"/" + data.landing_page?.slug}>Ver más</Link>
)}
</div>
</div>
Expand Down
45 changes: 26 additions & 19 deletions src/components/expandGrid/expandGrid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
cursor: pointer;

@media screen and (max-width: $breakpoint-xxl) {
flex: 0 1 calc(calc(100% / 2) - 10px);
flex: 0 1 calc(calc(100% / 3) - 10px);
}

@media screen and (max-width: 890px) {
Expand All @@ -54,10 +54,6 @@
&-expanded {
@extend .listItem;
flex-basis: 100%;

@media screen and (max-width: 890px) {
height: 800px;
}
}
}

Expand All @@ -66,7 +62,7 @@
flex-direction: row;
height: 100%;
position: relative;
@media screen and (max-width: 890px) {
@media screen and (max-width: $breakpoint-xl) {
flex-direction: column;
align-items: unset;
}
Expand All @@ -85,13 +81,21 @@

&-expanded {
@extend .avatar;
box-shadow: 0px 4px 4px 0px #00000040;

flex-grow: 0;
margin-right: 0;
min-width: 33%;
max-width: 33%;
@media screen and (max-width: 1500px) {
min-width: 50%;
max-width: 50%;
@media screen and (max-width: $breakpoint-xl) {
min-width: 100%;
max-width: 100%;
height: 400px;
object-fit: cover;
}
@media screen and (max-width: $breakpoint-md) {
height: unset;
object-fit: unset;
}
}
}
Expand All @@ -107,14 +111,16 @@
}

.additional-content {
box-shadow: 0px 4px 4px 0px #00000040;
width: 100%;
overflow: hidden;
@media screen and (max-width: 890px) {
margin: 0;
}
}

.listItem-more{

.listItem-more {
position: absolute;
inset: 0 0 20px 20px;
display: flex;
Expand All @@ -123,14 +129,17 @@
transition: opacity 200ms ease;
opacity: 1;
color: black;
p{
width: 300px;
p {
padding: 0;
margin: 0;
}
&-expanded{
&-expanded {
@extend .listItem-more;
opacity: 0;
padding: 0 !important;
@media screen and (max-width: $breakpoint-xl) {
display: none;
}
}
}

Expand All @@ -139,18 +148,16 @@
border-radius: 3px;
display: flex;
flex-direction: column;
height: 100%;
p {
max-height: 10vw;
&-markdown{
height: 80%;
overflow: hidden;
text-overflow: ellipsis;
}
a{
a {
font-weight: 600;
color: $secondary;
text-decoration: underline;
margin: auto 0 10px 10px;
}
}
h4 {
text-align: left;
}
Expand Down