Skip to content

Commit 73a44cd

Browse files
Merge pull request #278 from bitlogic/dev
Release 20-08-2024
2 parents ec9d942 + 3a97fcd commit 73a44cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1632
-1179
lines changed

gatsby-config.js

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,13 @@ module.exports = {
7171
},
7272
},
7373
{
74-
resolve: `gatsby-plugin-google-gtag`,
74+
resolve: "gatsby-plugin-google-tagmanager",
7575
options: {
76-
// You can add multiple tracking ids and a pageview event will be fired for all of them.
77-
trackingIds: ["G-F6VPYEJ1X0"],
78-
gtagConfig: {
79-
anonymize_ip: true,
80-
cookie_expires: 0,
81-
cookie_flags: "SameSite=None; Secure",
82-
},
83-
// This object is used for configuration specific to this plugin
84-
pluginConfig: {
85-
head: true,
86-
respectDNT: true,
87-
},
76+
id: process.env.GTM_ID,
77+
includeInDevelopment: false,
78+
enableWebVitalsTracking: true,
8879
},
8980
},
90-
"gatsby-plugin-react-helmet",
9181
{
9282
resolve: `gatsby-source-filesystem`,
9383
options: {
@@ -169,13 +159,5 @@ module.exports = {
169159
},
170160
"gatsby-plugin-offline",
171161
`gatsby-plugin-sass`,
172-
/* {
173-
resolve: "gatsby-plugin-hubspot",
174-
options: {
175-
trackingCode: "8668423",
176-
respectDNT: true,
177-
productionOnly: true,
178-
},
179-
}, */
180162
],
181163
}

package.json

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@
1414
"bootstrap": "^5.1.0",
1515
"gatsby": "^4.6.0",
1616
"gatsby-background-image": "^1.5.3",
17+
"gatsby-plugin-google-tagmanager": "^4.25.0",
1718
"gatsby-plugin-canonical-urls": "^4.22.0",
18-
"gatsby-plugin-gatsby-cloud": "^4.6.0",
19-
"gatsby-plugin-google-analytics": "^3.12.0",
20-
"gatsby-plugin-google-gtag": "^4.6.0",
21-
"gatsby-plugin-google-marketing-platform": "^0.2.0",
2219
"gatsby-plugin-image": "^2.6.0",
2320
"gatsby-plugin-manifest": "^4.6.0",
2421
"gatsby-plugin-offline": "^5.6.0",
25-
"gatsby-plugin-react-helmet": "^5.6.0",
2622
"gatsby-plugin-robots-txt": "^1.8.0",
2723
"gatsby-plugin-sass": "^5.6.0",
2824
"gatsby-plugin-sharp": "^4.6.0",
@@ -40,13 +36,9 @@
4036
"react-dom": "^17.0.1",
4137
"react-flip-toolkit": "^7.0.13",
4238
"react-helmet": "^6.1.0",
43-
"react-hook-form": "^7.11.0",
4439
"react-icons": "^4.2.0",
45-
"react-intersection-observer": "^8.33.1",
46-
"react-lottie": "^1.2.3",
47-
"react-markdown": "5.0.3",
40+
"react-lottie": "1.2.4",
4841
"react-multi-carousel": "^2.8.0",
49-
"react-script-tag": "^1.1.2",
5042
"react-showdown": "^2.3.1",
5143
"sass": "^1.49.0",
5244
"webpack-filter-warnings-plugin": "^1.2.1"
@@ -74,4 +66,4 @@
7466
"bugs": {
7567
"url": "https://github.com/gatsbyjs/gatsby/issues"
7668
}
77-
}
69+
}

src/components/Banner/Banner.scss

Lines changed: 66 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
width: 100%;
55
height: 100%;
66

7-
p {
8-
font-size: $medium;
9-
}
10-
117
&__wrapper {
128
color: $primary;
139
overflow: hidden;
@@ -23,10 +19,6 @@
2319
-webkit-box-align: center;
2420
-ms-flex-align: center;
2521
align-items: center;
26-
27-
.imagen {
28-
min-height: 450px;
29-
}
3022
}
3123

3224
.cont-lottie {
@@ -36,7 +28,7 @@
3628

3729
&.background {
3830
.banner__wrapper {
39-
padding: 0
31+
padding: 0;
4032
}
4133

4234
.button {
@@ -46,8 +38,7 @@
4638
}
4739

4840
.bgImage {
49-
margin: 32px 0 !important;
50-
width: 100%;
41+
margin: 32px 0;
5142
}
5243

5344
.title-background {
@@ -88,7 +79,6 @@
8879
word-wrap: initial;
8980
}
9081

91-
h2,
9282
h3 {
9383
font-weight: 400;
9484
text-align: left;
@@ -141,7 +131,7 @@
141131

142132
img {
143133
width: 100%;
144-
object-fit: cover;
134+
max-width: 450px;
145135
}
146136
}
147137

@@ -182,7 +172,6 @@
182172

183173
img {
184174
width: 100%;
185-
height: 100%;
186175
object-fit: cover;
187176
}
188177
}
@@ -253,7 +242,7 @@
253242

254243
.title-background {
255244
margin: 0 auto;
256-
width: 80%;
245+
width: 70%;
257246
}
258247
}
259248

@@ -279,7 +268,7 @@
279268

280269
&.top {
281270
.title {
282-
h1 {
271+
h2 {
283272
margin-bottom: 1rem;
284273
text-align: left;
285274
}
@@ -302,11 +291,13 @@
302291

303292
&.topReverse {
304293
.imagen {
294+
overflow: hidden;
295+
padding: 0;
305296
height: 100%;
306297

307298
img {
308299
width: 100%;
309-
height: 100%;
300+
max-width: 600px;
310301
}
311302

312303
.cont-lottie {
@@ -316,10 +307,23 @@
316307
}
317308

318309
.title {
310+
padding-top: 0;
311+
padding-bottom: 0;
319312
-webkit-box-orient: horizontal;
320313
-webkit-box-direction: reverse;
321314
-ms-flex-direction: row-reverse;
322315
flex-direction: row-reverse;
316+
317+
h2 {
318+
margin-bottom: 1rem;
319+
padding-right: 3rem;
320+
text-align: left;
321+
}
322+
323+
h3 {
324+
font-weight: 400;
325+
padding-right: 3rem;
326+
}
323327
}
324328
}
325329

@@ -349,6 +353,15 @@
349353
.title {
350354
padding: 20px 0;
351355
flex: 1;
356+
357+
h2 {
358+
margin-bottom: 1rem;
359+
max-width: 300px;
360+
}
361+
362+
h3 {
363+
font-weight: 400;
364+
}
352365
}
353366
}
354367

@@ -390,9 +403,17 @@
390403
padding: 0;
391404
flex: 2;
392405

393-
&>div {
406+
& > div {
394407
width: 70%;
395408
}
409+
410+
h2 {
411+
margin-bottom: 1rem;
412+
}
413+
414+
h3 {
415+
font-weight: 400;
416+
}
396417
}
397418
}
398419
}
@@ -415,8 +436,8 @@
415436

416437
&.hero {
417438
.banner__wrapper {
418-
min-height: 600px;
419439
flex-direction: row;
440+
height: 600px;
420441
gap: 32px;
421442
}
422443

@@ -425,6 +446,15 @@
425446
overflow: hidden;
426447
padding: 0;
427448

449+
.gatsby-image-wrapper.gatsby-image-wrapper-constrained {
450+
width: 100%;
451+
height: 100%;
452+
453+
img {
454+
object-fit: contain !important;
455+
}
456+
}
457+
428458
.cont-lottie {
429459
width: 100%;
430460
height: 100%;
@@ -434,12 +464,10 @@
434464
.title {
435465
h1 {
436466
margin-bottom: 1rem;
437-
padding-right: 3rem;
438467
}
439468

440469
h3 {
441470
font-weight: 400;
442-
padding-right: 3rem;
443471
}
444472
}
445473
}
@@ -496,15 +524,6 @@
496524
&.diagonal {
497525
.banner__wrapper {
498526
max-height: 450px;
499-
margin-right: 0;
500-
margin-left: 8%;
501-
max-width: calc(100% - 8%);
502-
padding: 0;
503-
}
504-
505-
.title {
506-
display: flex;
507-
justify-content: end;
508527
}
509528

510529
.imagen {
@@ -513,11 +532,17 @@
513532
height: 400px;
514533
}
515534
}
535+
536+
.title {
537+
h2 {
538+
margin-bottom: 1rem;
539+
max-width: 400px;
540+
}
541+
}
516542
}
517543
}
518544

519545
@media screen and (min-width: $breakpoint-xxl) {
520-
521546
&.hero,
522547
&.top,
523548
&.topReverse,
@@ -529,9 +554,16 @@
529554

530555
&.diagonal {
531556
.banner__wrapper {
532-
margin-left: 15%;
533-
max-width: calc(100% - 15%);
557+
margin-right: 0;
558+
margin-left: 200px;
559+
max-width: calc(100% - 200px);
560+
padding: 0;
561+
}
562+
563+
.title {
564+
display: flex;
565+
justify-content: end;
534566
}
535567
}
536568
}
537-
}
569+
}

src/components/BannerList/Banner.scss

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,47 +29,21 @@
2929
}
3030
}
3131

32-
button {
33-
margin-top: 10px;
34-
@include primaryBtn;
35-
align-self: baseline;
36-
37-
a {
38-
color: inherit;
39-
}
40-
}
41-
4232
&__title {
4333
display: flex;
4434
flex-direction: column;
4535
font-weight: 700;
4636
text-align: left;
4737
text-transform: uppercase;
48-
}
49-
}
5038

51-
@media screen and (min-width: $breakpoint-xl) {
52-
.bannerList {
53-
&__buttonMobile {
54-
display: none;
55-
}
56-
}
57-
}
39+
a {
40+
margin-top: 10px;
41+
@include primaryBtn;
42+
align-self: baseline;
5843

59-
@media screen and (max-width: $breakpoint-md) {
60-
.bannerList {
61-
&__title {
62-
button {
44+
@media screen and (max-width: ($breakpoint-md - 1px)) {
6345
display: none;
6446
}
6547
}
6648
}
6749
}
68-
69-
@media screen and (min-width: $breakpoint-md) {
70-
.bannerList {
71-
&__buttonMobile {
72-
display: none;
73-
}
74-
}
75-
}

0 commit comments

Comments
 (0)