diff --git a/linkerd.io/assets/scss/bulma.scss b/linkerd.io/assets/scss/bulma.scss index f7c8339488..60c31ebe26 100644 --- a/linkerd.io/assets/scss/bulma.scss +++ b/linkerd.io/assets/scss/bulma.scss @@ -102,6 +102,12 @@ $tablet-enabled: false; } } +.has-gradient-text { + background-image: -webkit-linear-gradient(0deg, $deep-blue, $primary-bright-blue); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} + body { font: 400 18px/28px "Open Sans" !important; } diff --git a/linkerd.io/assets/scss/styles.scss b/linkerd.io/assets/scss/styles.scss index 89e0eb028a..9f372adf6b 100644 --- a/linkerd.io/assets/scss/styles.scss +++ b/linkerd.io/assets/scss/styles.scss @@ -70,9 +70,6 @@ font-weight: 700 !important; line-height: 1 !important; letter-spacing: -1.5px; - background-image: -webkit-linear-gradient(0deg, $deep-blue, $primary-bright-blue); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; } .linky { display: none; @@ -81,7 +78,7 @@ right: 20%; z-index: 1; } - @media screen and (min-width: 768px) { + @include from($tablet) { background-image: url(/images/homepage-top-hero-pattern.png); .notification { padding-top: 80px; @@ -94,7 +91,7 @@ display: block; } } - @media screen and (min-width: 1440px) { + @include from($fullhd) { .notification { padding-top: 120px; padding-bottom: 120px; @@ -236,13 +233,13 @@ background-image: linear-gradient(-90deg, $aqua-green, rgba($aqua-green, 0)); right: 0; } - @media screen and (min-width: 768px) { + @include from($tablet) { &::before, &::after { width: 100px; } } - @media screen and (min-width: 1024px) { + @include from($desktop) { &::before, &::after { width: 200px; @@ -263,6 +260,110 @@ } } +.enterprise-top-hero { + .notification { + padding-top: 60px; + padding-bottom: 60px; + } + h1 { + font-weight: 700 !important; + line-height: 1.1 !important; + letter-spacing: -1.5px; + } + p { + margin: 14px 0; + } + @include from($tablet) { + .notification { + padding-top: 80px; + padding-bottom: 80px; + } + h1 { + font-size: 60px !important; + } + h1, p { + max-width: 700px; + } + } + @media screen and (min-width: 900px) { + .notification { + background-image: none; + background-repeat: no-repeat; + background-position: center right; + background-image: url(/uploads/enterprise/enterprise-background.svg); + background-size: 400px auto; + } + } + @include from($desktop) { + .notification { + background-size: 500px auto; + } + } + @include from($widescreen) { + .notification { + background-size: auto 100%; + } + } +} + +.enterprise-support { + padding: 80px 0 160px 0; + background-image: linear-gradient($light-blue, rgba($light-blue, 0)); + background-size: 100% 200px; + background-repeat: no-repeat; + .title { + font-weight: 600 !important; + line-height: 1.1 !important; + } + h2.title { + margin-bottom: 80px; + font-size: 40px !important; + } + .enterprise-support__entry { + margin-bottom: 48px; + padding: 24px; + &:last-of-type { + margin-bottom: 0; + } + h3.title { + font-size: 32px !important; + } + ul { + list-style-type: disc; + padding-left: 24px; + } + img { + max-width: 200px; + } + } + @include from($tablet) { + h2.title { + font-size: 48px !important; + } + .enterprise-support__entry { + margin-bottom: 80px; + padding: 60px; + h3.title { + font-size: 40px !important; + } + img { + max-width: 100%; + } + .enterprise-support__entry-content { + order: 1; + } + .enterprise-support__entry-image { + order: 2; + } + } + } + @include from($fullhd) { + .enterprise-support__entry { + padding: 60px 120px; + } + } +} + .foundation-member { .foundation-member-banner { padding: 40px 0 30px 0; @@ -306,13 +407,6 @@ background-color: $white; } -.enterprise-top-hero { - background: url('/images/enterprise_left.svg'), - url('/images/enterprise_right.svg'); - background-repeat: no-repeat; - background-position: left top, right top; -} - .platform-top-hero { background: url('/images/choose_your_platform_left.svg'), url('/images/choose_your_platform_right.svg'); diff --git a/linkerd.io/content/enterprise.md b/linkerd.io/content/enterprise.md new file mode 100644 index 0000000000..193f46ff7c --- /dev/null +++ b/linkerd.io/content/enterprise.md @@ -0,0 +1,44 @@ +--- +description: Lists of educational resources and companies that provide commercial support for Linkerd. +title: Enterprise +aliases: + - /support-training/ +layout: enterprise +type: enterprise +weight: 1 +menu: + top: + weight: 5 +top_hero: + title: Linkerd Enterprise Support and Training + description: "Linkerd was created by Buoyant and contributed to the Cloud Native Computing Foundation in 2017. It was the first service mesh to achieve graduated status, and today powers the critical production systems of enterprises around the world.\n\nHere, you'll find commercial products, support, and training for Linkerd." +support: + - title: Enterprise Support + entries: + - title: Enterprise support from Buoyant, creators of Linkerd + description: "- 24x7 Enterprise Support\n- FIPS compliant distribution\n- Support, training, architectural reviews, and more" + image: /uploads/enterprise/buoyant.svg + button: + href: https://buoyant.io/ + text: Learn more + - title: Enterprise-grade Linkerd Support for Production Environment + description: "Run Linkerd confidently with 24*7 enterprise support from the officially recognized commercial services Linkerd partner." + image: /uploads/enterprise/infracloud.svg + button: + href: https://www.infracloud.io/linkerd-support/ + text: Learn more + - title: Training + entries: + - title: Buoyant Service Mesh Academy + description: "Hands-on, engineer-focused training from the creators of the service mesh. Self-paced courses and monthly live workshops providing hands-on training on Linkerd and related CNCF projects." + image: /uploads/enterprise/buoyant-service-mesh-academy.svg + button: + href: https://buoyant.io/service-mesh-academy/ + text: Learn more + - title: The Linux Foundation + description: "Get hands-on practical experience with Linkerd, the open source, open governance, ultralight CNCF service mesh for Kubernetes with this self-paced course." + image: /uploads/enterprise/linux-foundation.png + button: + href: https://www.edx.org/course/introduction-to-service-mesh-with-linkerd + text: Learn more +--- diff --git a/linkerd.io/content/support-training.md b/linkerd.io/content/support-training.md deleted file mode 100644 index ecd031aef3..0000000000 --- a/linkerd.io/content/support-training.md +++ /dev/null @@ -1,55 +0,0 @@ ---- -description: Lists of educational resources and companies that provide commercial support for Linkerd. -title: Support & Training -aliases: - - /enterprise/ -layout: enterprise -type: enterprise -weight: "1" -menu: - top: - weight: 4 - -support: - kinds: - - title: 'Providers' - entries: - - title: Buoyant - thumbnail: "/images/buoyant-balloon.svg" - url: https://buoyant.io/linkerd - description: |- - The Linkerd Production Toolkit comes to you straight from the creators of Linkerd. - - - title: 'Courses' - entries: - - title: The Linux Foundation - thumbnail: "/uploads/linux-foundation-logo.svg" - url: https://www.edx.org/course/introduction-to-service-mesh-with-linkerd - description: |- - Introduction to Service Mesh with Linkerd | edx - - title: Buoyant - thumbnail: "/images/buoyant-balloon.svg" - url: https://buoyant.io/linkerd-training/ - description: |- - Hands-on, instructor-led service mesh training, straight from the creators of Linkerd. - - - title: 'Commercial support' - entries: - - title: Buoyant - thumbnail: "/images/buoyant-balloon.svg" - url: https://buoyant.io/linkerd-support/ - description: |- - Enterprise-grade support including 24x7 oncall, straight from the creators of Linkerd. - - - title: InfraCloud - thumbnail: "/uploads/infracloud-only-icon-logo.svg" - url: https://www.infracloud.io/linkerd-support/ - description: |- - Your extended team for Linkerd enterprise support & setting it up from scratch. We got you covered! - - bottom_description: Offering Linkerd support or training? Add your company! - description: '' - buttons: - - caption: Edit this page - url: https://github.com/linkerd/website/edit/main/linkerd.io/content/support-training.md ---- diff --git a/linkerd.io/layouts/enterprise/enterprise.html b/linkerd.io/layouts/enterprise/enterprise.html index caa9123c25..7c1e44735c 100644 --- a/linkerd.io/layouts/enterprise/enterprise.html +++ b/linkerd.io/layouts/enterprise/enterprise.html @@ -1,3 +1,4 @@ {{ define "main" }} +{{ partial "enterprise/top-hero.html" .Params.top_hero }} {{ partial "enterprise/support.html" .Params.support }} {{ end }} diff --git a/linkerd.io/layouts/partials/enterprise/support.html b/linkerd.io/layouts/partials/enterprise/support.html index ef66fabef4..e84029b5cd 100644 --- a/linkerd.io/layouts/partials/enterprise/support.html +++ b/linkerd.io/layouts/partials/enterprise/support.html @@ -1,44 +1,26 @@ -
-
- {{ range .kinds }} -

{{.title}}

-
{{.description | markdownify}}
-
- {{ range .entries }} -
- -
- +
- -
- {{ end }} -
- {{ end }} -
{{.bottom_description | markdownify}}
-
- {{ range .buttons }} -
- - {{.caption}} - -
+ {{ end }} {{ end }}
diff --git a/linkerd.io/layouts/partials/enterprise/top-hero.html b/linkerd.io/layouts/partials/enterprise/top-hero.html new file mode 100644 index 0000000000..6985cb1a31 --- /dev/null +++ b/linkerd.io/layouts/partials/enterprise/top-hero.html @@ -0,0 +1,10 @@ +
+
+
+

{{ .title }}

+
+ {{ .description | markdownify }} +
+
+
+
diff --git a/linkerd.io/layouts/partials/homepage/top-hero.html b/linkerd.io/layouts/partials/homepage/top-hero.html index 04ad256924..43ba8d35a3 100644 --- a/linkerd.io/layouts/partials/homepage/top-hero.html +++ b/linkerd.io/layouts/partials/homepage/top-hero.html @@ -3,7 +3,7 @@
-

{{.title}}

+

{{.title}}

{{.description | markdownify}}
{{ range .buttons }} diff --git a/linkerd.io/static/uploads/enterprise/buoyant-service-mesh-academy.svg b/linkerd.io/static/uploads/enterprise/buoyant-service-mesh-academy.svg new file mode 100644 index 0000000000..968221a622 --- /dev/null +++ b/linkerd.io/static/uploads/enterprise/buoyant-service-mesh-academy.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/linkerd.io/static/uploads/enterprise/buoyant.svg b/linkerd.io/static/uploads/enterprise/buoyant.svg new file mode 100644 index 0000000000..04ea916c86 --- /dev/null +++ b/linkerd.io/static/uploads/enterprise/buoyant.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linkerd.io/static/uploads/enterprise/enterprise-background.svg b/linkerd.io/static/uploads/enterprise/enterprise-background.svg new file mode 100644 index 0000000000..d3962a2095 --- /dev/null +++ b/linkerd.io/static/uploads/enterprise/enterprise-background.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linkerd.io/static/uploads/enterprise/infracloud.svg b/linkerd.io/static/uploads/enterprise/infracloud.svg new file mode 100644 index 0000000000..3c655e2237 --- /dev/null +++ b/linkerd.io/static/uploads/enterprise/infracloud.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/linkerd.io/static/uploads/enterprise/linux-foundation.png b/linkerd.io/static/uploads/enterprise/linux-foundation.png new file mode 100644 index 0000000000..c1b77af90d Binary files /dev/null and b/linkerd.io/static/uploads/enterprise/linux-foundation.png differ