Skip to content

Commit 6ef3155

Browse files
committed
Merge branch 'staging/3.9' into release/3.9
2 parents 7dfcfe3 + 0e99457 commit 6ef3155

File tree

107 files changed

+1476
-554
lines changed

Some content is hidden

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

107 files changed

+1476
-554
lines changed

_includes/marketplace-style.css

Lines changed: 81 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,65 @@
1-
p, h1, h3, h5 {
1+
body {
2+
background-color: #F7F9FC;
3+
}
4+
5+
.marketplace-title {
26
color: #212529;
7+
font-size: 56px;
8+
font-weight: 600;
9+
line-height: 72px;
10+
letter-spacing: 0.14px;
11+
text-align: center;
12+
margin-bottom: 32px;
313
}
414

5-
body {
6-
background-color: #F7F9FC;
15+
.marketplace-desc {
16+
color: rgba(0, 0, 0, 0.76);
17+
font-size: 20px;
18+
font-weight: 400;
19+
line-height: 32px;
20+
letter-spacing: 0.15px;
21+
text-align: center;
22+
}
23+
24+
.marketplace-cards {
25+
display: flex;
26+
justify-content: space-between;
27+
gap: 32px;
28+
margin: 56px 0;
29+
}
30+
31+
.marketplace-card {
32+
display: flex;
33+
flex-direction: column;
34+
gap: 16px;
35+
padding: 46px;
36+
border-radius: 24px;
37+
background: #FFF;
38+
box-shadow: -4px 15px 50px -20px rgba(0, 0, 0, 0.15), 0px 0px 8px 0px rgba(0, 0, 0, 0.08);
39+
width: 100%;
40+
animation: slide-in 0.8s ease-out forwards
41+
}
42+
43+
.marketplace-card .marketplace-card-icon {
44+
padding: 25px;
45+
border-radius: 24px;
46+
border: 3px solid #3E9AF8;
47+
width: fit-content;
48+
}
49+
50+
.marketplace-card .marketplace-card-title {
51+
font-size: 28px;
52+
font-weight: 500;
53+
line-height: 44px;
54+
letter-spacing: 0.249px;
55+
color: #2A7DEC;
56+
}
57+
58+
.marketplace-card .marketplace-card-desc {
59+
font-size: 16px;
60+
font-weight: 400;
61+
line-height: 28px;
62+
letter-spacing: 0.15px;
763
}
864

965
.background {
@@ -36,36 +92,13 @@ body {
3692
}
3793

3894
/*#hardwareContainer:after*/
39-
#users main h1 {
40-
font-size: 36px;
41-
font-weight: 500;
42-
line-height: 54px;
43-
margin: 10px 0 32px;
44-
text-align: center;
45-
}
46-
47-
#users main h3 {
48-
font-size: 30px;
49-
font-weight: 500;
50-
line-height: 54px;
51-
margin: 10px 0 32px;
52-
text-align: center;
53-
}
54-
55-
#users main h5 {
56-
text-align: center;
57-
font-size: 20px;
58-
line-height: 1.5em;
59-
font-weight: normal;
60-
margin-bottom: 60px;
61-
}
62-
6395
p.button-section {
96+
margin-top: 32px;
6497
padding-bottom: 48px;
6598
}
6699

67100
.button {
68-
font-size: 18px;
101+
font-size: 16px;
69102
padding: 12px 20px;
70103
}
71104

@@ -84,23 +117,31 @@ section {
84117
}
85118
}
86119

87-
@media screen and (max-width: 768px) {
88-
#users {
89-
padding: 30px 20px 0;
120+
@keyframes slide-in {
121+
from {
122+
opacity: 0;
123+
transform: translateY(30%);
90124
}
91125

92-
#users main h1 {
93-
font-size: 32px;
94-
line-height: 50px;
126+
to {
127+
opacity: 1;
128+
transform: translateY(0);
95129
}
130+
}
96131

97-
#users main h3 {
98-
font-size: 26px;
99-
line-height: 50px;
132+
@media screen and (max-width: 1100px) {
133+
.marketplace-cards {
134+
flex-wrap: wrap;
100135
}
136+
}
101137

102-
#users main h5 {
138+
@media screen and (max-width: 500px) {
139+
.marketplace-title {
140+
font-size: 46px;
141+
line-height: 65px;
142+
}
143+
.marketplace-desc {
103144
font-size: 16px;
145+
line-height: 25px;
104146
}
105-
106-
}
147+
}

_includes/partner-script.js

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,24 @@ function rengen() {
3333
box.appendChild(programImg);
3434
}
3535

36+
var cardHeader = document.createElement('div');
37+
cardHeader.className = "cardHeader"
38+
3639
var img = document.createElement('img');
3740
img.className = 'logo';
3841
img.src = 'https://img.thingsboard.io/partners/' + obj.logo;
3942

43+
var siteLink = document.createElement('a');
44+
siteLink.className = 'siteLink';
45+
siteLink.textContent = 'Website';
46+
siteLink.href = obj.site.href;
47+
siteLink.target = obj.site.target;
48+
4049
var div = document.createElement('div');
50+
div.className = 'wrapper';
51+
52+
var cardContent = document.createElement('div');
53+
cardContent.className = 'card-content';
4154

4255
var titleElement = document.createElement('p');
4356
titleElement.textContent = obj.name;
@@ -54,7 +67,7 @@ function rengen() {
5467
bg.className = 'box-background';
5568

5669
var linksElement = document.createElement('div');
57-
linksElement.className = 'links';
70+
linksElement.className = 'links owl-carousel partnersCarousel';
5871

5972
for (var linkName in obj.links) {
6073
var linkInfo = obj.links[linkName];
@@ -67,12 +80,21 @@ function rengen() {
6780
linksElement.appendChild(link);
6881
}
6982

83+
if(linksElement.children.length >= 2) {
84+
linksElement.classList.add('usecase-carousel', 'owl-theme', 'smallArrow');
85+
} else {
86+
linksElement.classList.remove('owl-carousel', 'partnersCarousel');
87+
}
88+
89+
cardHeader.appendChild(img);
90+
cardHeader.appendChild(siteLink);
7091
text.appendChild(titleElement);
7192
text.appendChild(p);
72-
div.appendChild(text);
93+
cardContent.appendChild(cardHeader);
94+
cardContent.appendChild(text);
95+
div.appendChild(cardContent);
7396
div.appendChild(linksElement);
7497
box.appendChild(bg);
75-
box.appendChild(img);
7698
box.appendChild(div);
7799

78100

@@ -81,7 +103,7 @@ function rengen() {
81103

82104
if (partnersType === 'hardware') {
83105
var becomeHardwarePartnerBox = document.createElement('div');
84-
becomeHardwarePartnerBox.className = 'partner-box';
106+
becomeHardwarePartnerBox.className = 'partner-box become-partner-box';
85107

86108
var bg = document.createElement('div');
87109
bg.className = 'box-background';
@@ -127,4 +149,23 @@ function actions(sectionId) {
127149
rengen();
128150
}
129151
}
152+
153+
jqueryDefer(addCarousel);
154+
}
155+
156+
function addCarousel() {
157+
$('.owl-carousel').each(function(index) {
158+
const $carousel = $(this);
159+
const carouselId = "owl-carousel-" + index;
160+
$(this).attr("id", carouselId);
161+
162+
if(!$carousel[0].classList.contains("owl-loaded")) {
163+
$('#' + carouselId).owlCarousel({
164+
autoWidth: true,
165+
margin: 10,
166+
nav: true,
167+
dots: false
168+
});
169+
}
170+
})
130171
}

0 commit comments

Comments
 (0)