Merge branch 'globalping.io' into gh-673

jsdelivr · Sep 28, 2024 · 916f84c · 916f84c
2 parents f98d020 + b254969
commit 916f84c
Show file tree

Hide file tree

Showing 19 changed files with 47 additions and 138 deletions.
diff --git a/src/assets/img/landing/render.png b/src/assets/img/landing/render.png
diff --git a/src/assets/img/landing/[email protected] b/src/assets/img/landing/[email protected]
diff --git a/src/assets/img/sponsors/macarne.svg b/src/assets/img/sponsors/macarne.svg
diff --git a/src/assets/img/sponsors/render-black.svg b/src/assets/img/sponsors/render-black.svg
diff --git a/src/assets/img/sponsors/render.png b/src/assets/img/sponsors/render.png
diff --git a/src/assets/img/sponsors/[email protected] b/src/assets/img/sponsors/[email protected]
diff --git a/src/assets/js/utils/http.js b/src/assets/js/utils/http.js
@@ -281,11 +281,14 @@ module.exports.getGlobalpingMeasurement = (id) => {
 	return _.makeHTTPRequest({ url: `${GLOBALPING_HOST}/v1/measurements/${id}` });
 };
 
-
 module.exports.getBlogRss = () => {
 	return _.makeHTTPRequest({ url: `/blog/rss`, rawResponse: true });
 };
 
+module.exports.getGPBlogRss = () => {
+	return _.makeHTTPRequest({ url: `https://blog.globalping.io/rss`, rawResponse: true });
+};
+
 module.exports.getCdnOssFiles = (
 	name,
 	by = 'hits',

diff --git a/src/assets/less/pages/globalping/about-us.less b/src/assets/less/pages/globalping/about-us.less
@@ -20,7 +20,7 @@
 
 		@media (min-width: @screen-sm-min) {
 			max-width: 856px;
-			row-gap: 100px;
+			row-gap: 64px;
 			padding-top: 64px;
 		}
 
@@ -31,7 +31,6 @@
 			font-weight: 600;
 			line-height: 50px;
 			letter-spacing: .2px;
-			text-align: left;
 		}
 
 		&_info {
@@ -66,6 +65,7 @@
 				font-size: 20px;
 				font-weight: 400;
 				line-height: 32px;
+				color: #17233a;
 			}
 
 			&_focus {
@@ -78,7 +78,6 @@
 					font-size: 20px;
 					font-weight: 600;
 					line-height: 32px;
-					text-align: left;
 				}
 
 				&_list {
@@ -95,7 +94,7 @@
 						display: flex;
 						align-items: center;
 						column-gap: 16px;
-						padding: 0 0 0 24px;
+						padding: 0 24px;
 						height: 80px;
 						border-radius: 8px;
 						border: 1.5px solid #e7e7ee;
@@ -157,15 +156,13 @@
 							font-size: 16px;
 							font-weight: 400;
 							line-height: 20px;
-							text-align: left;
 						}
 
 						&_value {
 							align-self: flex-start;
 							font-size: 24px;
 							font-weight: 600;
 							line-height: 36px;
-							text-align: left;
 							background: linear-gradient(0deg, #17233a, #17233a), linear-gradient(66.12deg, rgba(23, 212, 167, 0) -.72%, #17d4a7 124.59%);
 							background-size: cover;
 							background-blend-mode: overlay;
@@ -191,10 +188,9 @@
 				row-gap: 20px;
 
 				> span {
-					font-size: 16px;
+					font-size: 18px;
 					font-weight: 400;
-					line-height: 20px;
-					text-align: left;
+					line-height: 26px;
 					color: #17233a;
 				}
 			}
@@ -208,10 +204,9 @@
 			padding: 0 24px;
 
 			&_descr {
-				font-size: 16px;
+				font-size: 18px;
 				font-weight: 400;
-				line-height: 20px;
-				text-align: left;
+				line-height: 26px;
 				color: #17233a;
 				margin: 0;
 			}
@@ -238,7 +233,6 @@
 						font-size: 24px;
 						font-weight: 600;
 						line-height: 36px;
-						text-align: left;
 						color: #17233a;
 					}
 
@@ -286,15 +280,13 @@
 									font-size: 20px;
 									font-weight: 600;
 									line-height: 32px;
-									text-align: left;
 									color: #17233a;
 								}
 
 								&_position {
 									font-size: 16px;
 									font-weight: 400;
 									line-height: 20px;
-									text-align: left;
 									color: #17233a;
 								}
 

diff --git a/src/assets/less/pages/sponsors.less b/src/assets/less/pages/sponsors.less
@@ -277,6 +277,14 @@
 							height: 30px;
 						}
 					}
+
+					&.render {
+						height: 30px;
+
+						@media (min-width: 576px) {
+							height: 40px;
+						}
+					}
 				}
 
 				.sp-text {
@@ -303,11 +311,6 @@
 		}
 
 		&.row-gold .sp-item {
-			&.auto-height {
-				min-height: 272px;
-				height: auto;
-			}
-
 			@media (min-width: @screen-lg-min) {
 				height: 272px;
 			}

diff --git a/src/routes/jsdelivr.js b/src/routes/jsdelivr.js
@@ -178,7 +178,7 @@ koaElasticUtils.addRoutes(router, [
  */
 router.get('/globalping/:path(.*)?', async (ctx) => {
 	ctx.status = 301;
-	return ctx.redirect(`https://globalping.io/${ctx.params.path || ''}`);
+	return ctx.redirect(`https://globalping.io${ctx.url.replace(/^\/[^/?]+/, '')}`);
 });
 
 module.exports = router;