Skip to content

Commit

Permalink
Merge branch 'main' into aem-live-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
Matei-Iordache committed Jan 14, 2025
2 parents 6c3d7ff + ebee653 commit 7d2f04d
Show file tree
Hide file tree
Showing 106 changed files with 12,409 additions and 6,691 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ _src/scripts/vendor
_src/vendor
_src/plugins
_src/scripts/libs/**
_src/scripts/utils/bot-prevention.js
tools
73 changes: 73 additions & 0 deletions _src/blocks/blog-news/blog-news.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
.blog-news {
max-width: 1330px;
margin: 0 auto;
padding: 0 20px;
}

.blog-news h2 {
font-size: 2rem;
margin-bottom: 10px;
}

.blog-news .blog-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
justify-content: center;
gap: 30px;
}

.blog-news .blog-card {
text-align: center;
overflow: hidden;
display: flex;
flex-direction: column;
align-items: center;
gap: 30px;
}

.blog-news .blog-card img {
object-fit: cover;
background-color: #FFD6D6;
border-radius: 20px;
}

.blog-news .blog-card p {
font-size: 1.2rem;
margin: 0;
margin-bottom: 24px;
font-weight: bold;
color: #000;
}

.blog-news .blog-card a {
text-decoration: none;
color:#006EFF;
font-weight: bold;
}

.blog-news .blog-card a:hover {
text-decoration: underline;
}

.blog-news .blog-card .blog-card-content {
display: flex;
flex-direction: column;
gap: 24px;
text-align: left;
}

@media (min-width: 1440px){
.blog-news .blog-grid{
grid-template-columns: repeat(3, 1fr)
}

.blog-news .blog-card img {
width: 420px;
height: 308px;
object-fit: cover;
background-color: #FFD6D6;
border-radius: 20px;
}

}

50 changes: 50 additions & 0 deletions _src/blocks/blog-news/blog-news.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import { matchHeights } from '../../scripts/utils/utils.js';

async function renderBlogGrid(block, endpoint, articlesNumber) {
const blogGrid = block.querySelector('.blog-grid');
try {
const response = await fetch(endpoint);
const rssText = await response.text();

const data = new window.DOMParser().parseFromString(rssText, 'text/xml');
const items = data.querySelectorAll('item');
let currentCount = 0;
items.forEach((item) => {
// eslint-disable-next-line no-plusplus
currentCount++;
if (currentCount > articlesNumber) return;
const link = item.querySelector('link').textContent;

const title = item.querySelector('title').textContent;
const media = item.querySelector('content');
const image = media.getAttribute('url');

// Create a blog card
const blogCard = document.createElement('a');
blogCard.setAttribute('href', link);
blogCard.classList.add('blog-card');

blogCard.innerHTML = `
<img src="${image}" alt="${title}">
<div class="blog-card-content">
<p>${title}</p>
<a href="${link}">Find out more</a>
</div>
`;

blogGrid.appendChild(blogCard);
});
} catch (error) {
// eslint-disable-next-line no-console
console.error(error);
}
}

export default function decorate(block) {
const { endpoint, articlesNumber } = block.closest('.section').dataset;
const blogGrid = document.createElement('div');
block.appendChild(blogGrid);
blogGrid.classList.add('blog-grid');
renderBlogGrid(block, endpoint, articlesNumber);
matchHeights(block, 'p');
}
227 changes: 227 additions & 0 deletions _src/blocks/columns/columns.css
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,36 @@
width: 100%;
}

.columns.ferrari-text > div{
align-items: unset;
}

.columns.ferrari-text h2{
color:#006DFF;
font-weight: 300;
}
.columns.ferrari-text .columns-text-col{
font-weight: 300;
}

.section.ferrari-quote .columns.ferrari-text .columns-text-col{
color:#006DFF;
}

.columns.ferrari-text .columns-text-col.button-container{
align-self: flex-end;
}

.section.ferrari-quote .columns.ferrari-text .columns-text-col a{
background: none;
border: none;
color:#006DFF;
text-align: right;
text-decoration: underline;
letter-spacing: 0;
display: block;
}

/* stylelint-disable-next-line selector-class-pattern */
.v2_benefits .columns-container .default-content-wrapper {
margin-bottom: 3em;
Expand Down Expand Up @@ -589,6 +619,17 @@
flex-direction: column;
justify-content: space-between;
}

.columns.ferrari-text h2{
font-size: 45px;
}
.columns.ferrari-text .columns-text-col{
font-size: 30px;
}

.section.ferrari-quote .columns.ferrari-text .columns-text-col{
font-size: 20px;
}
}

@media (min-width: 992px) { /* desktop */
Expand Down Expand Up @@ -1142,6 +1183,60 @@ main .section.two-columns .right-col .products.plans a.button:any-link {
justify-content: center;
}

.columns-container.icon-corners {
.columns-wrapper {
border-radius: 20px;
}

.columns {
padding: 40px;
}

> div {
position: relative;
}

.columns > div {
align-items: center;
}

> div > div > div:nth-child(1) > div:nth-child(2) {
flex: 2;

h2 {
font-size: 32px;
text-align: center;
z-index: 1;
position: relative;
}
}

span.icon-corner-left {
position: absolute;
top: 0;
left: 0;
width: 180px;
height: 180px;
z-index: 0;
}

span.icon-corner-right {
position: absolute;
top: 0;
right: 0;
width: 180px;
height: 180px;
transform: rotateY(180deg);
z-index: 0;
}

@media (min-width:768px){
.columns > div {
align-items: baseline;
}
}
}

@media (max-width: 1399px) {
.columns-wrapper {
padding: 0 var(--section-large-desktop-padding);
Expand Down Expand Up @@ -1252,6 +1347,22 @@ main .section.two-columns .right-col .products.plans a.button:any-link {
.columns.screenshots > div > .columns-img-col {
flex: 0 0 230px;
}

.columns-container.icon-corners {
.columns {
padding: 100px;
}

span.icon-corner-left {
width: 400px;
height: 300px;
}

span.icon-corner-right {
width: 400px;
height: 300px;
}
}
}

@media (max-width: 767px) {
Expand Down Expand Up @@ -1284,3 +1395,119 @@ main .section.two-columns .right-col .products.plans a.button:any-link {
margin: 0;
}
}

.columns-container.multi-blocks{
max-width: 1330px;
padding: 0 var(--section-desktop-padding);
margin: 0 auto;
display: flex;
flex-direction: column;
gap: 30px;

.columns-wrapper {
padding: 0;
margin: 0;
}

.columns{
width: 100%;
background: #F6F6F6 0% 0% no-repeat padding-box;
border-radius: 20px;
opacity: 1;
padding: 20px;
}

.columns > div > .columns-img-col img {
display: none;
}

p{
font-size: 16px;
margin: 0;
}

.button-container{
margin-top: 20px;
}

.button-container a{
width: 100%;
justify-content: center;
}

table{
margin-bottom: 15px;
}

td{
display: flex;
gap:15px;
align-items: center;

span{
margin: 0;
}

h3{
font-size: 24px;
margin: 0;
}

h6{
font-size: 14px;
color: #5F5F5F;
line-height: 0;
}

p{
align-content: center;
}

p:nth-last-of-type(2){
margin: 0;
}

hr{
border: 1px solid #006EFF;
width: 25px;
line-height: 0;
}
}

tr:last-of-type td{
height: 25px;
}

.columns > div > .columns-img-col {
margin-bottom: 0;
}

@media (min-width: 991px) {
max-width: 1330px;
padding: 0 var(--section-desktop-padding);
margin: 0 auto;
display: flex;
flex-direction: row;
gap: 30px;

.columns{
max-width: 630px;
}

.columns > div > .columns-img-col img {
object-fit: cover;
display: block;
border-radius: 20px;
}

.columns > div > .columns-text-col {
align-self: flex-start;
}
}

@media (min-width: 1200px){
.columns > div >div{
width: 50%;
}
}
}
Loading

0 comments on commit 7d2f04d

Please sign in to comment.