Merge branch 'main' into dependabot/npm_and_yarn/sites/platform/webpa…

…ck-5.94.0
platformsh · Sep 3, 2024 · e6d8da4 · e6d8da4
2 parents 861232d + cc491bb
commit e6d8da4
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 16 deletions.
diff --git a/sites/platform/config/_default/params.yaml b/sites/platform/config/_default/params.yaml
@@ -21,7 +21,7 @@ vendor:
         link: https://upsun.com/register/
         cta: Get your Upsun free trial
         title: Sign up for Upsun
-        description: "Get your free trial by clicking the link below.<br/><br/>"
+        description: "Get your free trial by clicking the link below."
     config:
         version: 1
         dir: .platform

diff --git a/sites/platform/src/create-apps/app-reference/single-runtime-image.md b/sites/platform/src/create-apps/app-reference/single-runtime-image.md
@@ -427,7 +427,7 @@ mounts:
 
 {{< variable "MOUNT_PATH" >}} is the path to your mount **within the app container** (relative to the app's root).
 If you already have a directory with that name, you get a warning that it isn't accessible after the build.
-See how to [troubleshoot the warning](/troubleshoot-mounts.md#overlapping-folders).
+See how to [troubleshoot the warning](/create-apps/troubleshoot-mounts.md#overlapping-folders).
 
 | Name          | Type                          | Required | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | ------------- |-------------------------------| -------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|

diff --git a/sites/upsun/config/_default/params.yaml b/sites/upsun/config/_default/params.yaml
@@ -22,9 +22,10 @@ vendor:
     recruit:
         active: true
         link: https://upsun.com/register/
-        cta: Get your Upsun free trial
-        title: Sign up
-        description: "Get your free trial by clicking the link below.<br/><br/>"
+        cta: Activate your 15-day trial
+        title: Try Upsun for 15 days
+        description: "After that, enjoy the same, game-changing Upsun features for less with the First Project Incentive!¹ A monthly $19 perk!"
+        fine: "¹Terms and condition apply"
     psh_ref: Platform.sh
     config:
         version: 2

diff --git a/sites/upsun/src/glossary/_index.md b/sites/upsun/src/glossary/_index.md
@@ -133,6 +133,20 @@ as it merely describes a non-production environment.
 
 Find out more about [user roles on each environment type](../administration/users.md#environment-type-roles).
 
+## First Project Incentive
+
+To help you get started {{< vendor/name >}} offers a monthly $19 USD perk called the First Project Incentive.
+
+### How do I apply this perk?
+
+Whether you are a new or existing customer, **_no action is needed_**. Just visit the billing section of your organization to see it applied.
+
+### Why don't I see the full amount applied to my bill?
+
+There are two reasons why you may not see the full amount applied to your bill.
+
+1. The First Project Incentive is prorated. If your billing cycle has started mid-month, it will be reflected in the amount applied to your bill.
+2. Your bill can never be less than $0. For example, if your total bill for the month is $10, the First Project Incentive will only apply up to $10.
 
 ## Inactive environment
 
@@ -217,7 +231,7 @@ even though it has mostly replaced SSL for online encrypted connections.
 When you create your first organization on {{% vendor/name %}}, you are also activating your trial for that organization.
 This trial grants you a certain amount of time and resources to try out the {{% vendor/name %}} platform, and comes with the following restrictions:
 
-1. A trial lasts for **5 days**, which starts automatically from creating your first organization.
+1. A trial lasts for **15 days**, which starts automatically from creating your first organization.
 1. A trial allows for **one (1)** active [project](#project) at a time.
 1. For a trial project, the trial allows for **two (2)** [active environments](#active-environment).
 1. At the organization level, there is a limit on the amount of [resources available to your project](/manage-resources):
@@ -229,6 +243,6 @@ This trial grants you a certain amount of time and resources to try out the {{%
 If your trial ends before adding payment details, there are additional things to keep in mind:
 
 - When a trial expires, both the organization and the project are suspended.
-- Projects where no code has been pushed are deleted **1 day** after a trial expires. 
+- Projects where no code has been pushed are deleted **1 day** after a trial expires.
 - Projects where code _has_ been pushed are deleted **5 days** after the trial expires.
 - Even with the trial expiration, organizations and user accounts are preserved, [rather than deleted](/learn/overview/get-support#delete-your-account).
diff --git a/themes/psh-docs/layouts/partials/page-content.html b/themes/psh-docs/layouts/partials/page-content.html
@@ -28,12 +28,12 @@ <h1 class="font-black text-2xl mb-8 xl:text-4xl">{{ .context.Title | .context.Re
 {{ end }}
 
 <div class="grid md:grid-cols-80-20 md:gap-4 print:block">
-  
+
   <div class="print:hidden max-w-[92vw] md:max-w-none md:order-2 md:top-24 md:sticky md:max-h-fullv md:overflow-y-auto border-t border-stone">
     <!-- Table of contents -->
     {{ if and (ne .context.Params.toc false) (ne .context.TableOfContents "<nav id=\"TableOfContents\"></nav>") }}
       <div class="border border-stone border-t-0 px-6 pt-1 pb-4 mb-8 md:mb-0 text-sm [&_a]:text-skye-dark hover:[&_a]:underline focus:[&_a]:underline [&_ul_ul]:pl-4">
-        
+
         {{ if not .context.Page.IsHome }}
         <h3 class="pt-4 pb-2 font-light text-base text-slate"><a href="/">Back to home</a></h3>
         {{ end }}
@@ -55,14 +55,47 @@ <h3 class="pt-4 pb-2 font-light text-base text-slate">On this page</h3>
       {{ if .context.Page.IsHome }}
       <div><br/></div>
       {{ end }}
-
-      <div class="recruit-banner bg-skye-light border-stone border-t-0 px-6 pt-1 pb-4 mb-8 md:mb-0 text-sm [&_a]:text-skye-dark hover:[&_a]:underline focus:[&_a]:underline [&_ul_ul]:pl-4">
-        {{ $recruitment := .context.Site.Params.vendor.recruit }}
-        <h3 class="pt-4 pb-2 font-light text-base text-slate">{{ index $recruitment "title" }}</h3>
-        <p>{{ index $recruitment "description" | safeHTML }}</p>
-        <p><a href="{{ index $recruitment "link" }}">{{ index $recruitment "cta" }}</a></p>
 
+    <div
+      class="bg-gradient-to-b from-[#FF4A11] from-0% via-[#ED49F0] via-45% to-[#DDF933] to-100% rounded-2xl p-[1px] my-1">
+      <div class="rounded-2xl p-5 bg-[#f9f9f9] flex-col justify-start items-start gap-4 inline-flex">
+        {{ $recruitment := .context.Site.Params.vendor.recruit }}
+        <div
+          class="bg-clip-text text-transparent bg-gradient-to-r from-[#806BFF] to-[#ED49F0] text-xl font-bold leading-normal">
+          {{ index $recruitment "title" }}
+        </div>
+        <div class="main-section justify-start items-start gap-2.5 inline-flex">
+          <div class="artwork">
+            <svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 26 26" fill="none">
+              <path
+                d="M3.65166 6.5473C3.65166 5.77459 3.9607 5.03352 4.51081 4.48712C5.06092 3.94073 5.80702 3.63376 6.58499 3.63376H7.91832C8.69285 3.63332 9.43578 3.32864 9.98499 2.78619L10.9183 1.85915C11.1909 1.58687 11.515 1.37079 11.872 1.22335C12.2289 1.0759 12.6117 1 12.9983 1C13.3849 1 13.7677 1.0759 14.1247 1.22335C14.4816 1.37079 14.8057 1.58687 15.0783 1.85915L16.0117 2.78619C16.5609 3.32864 17.3038 3.63332 18.0783 3.63376H19.4117C20.1896 3.63376 20.9357 3.94073 21.4858 4.48712C22.0359 5.03352 22.345 5.77459 22.345 6.5473V7.87164C22.3454 8.64095 22.6522 9.37886 23.1983 9.92436L24.1317 10.8514C24.4058 11.1222 24.6233 11.4441 24.7718 11.7986C24.9202 12.1532 24.9966 12.5334 24.9966 12.9174C24.9966 13.3014 24.9202 13.6816 24.7718 14.0361C24.6233 14.3907 24.4058 14.7126 24.1317 14.9833L23.1983 15.9104C22.6522 16.4559 22.3454 17.1938 22.345 17.9631V19.2874C22.345 20.0601 22.0359 20.8012 21.4858 21.3476C20.9357 21.894 20.1896 22.201 19.4117 22.201H18.0783C17.3038 22.2014 16.5609 22.5061 16.0117 23.0485L15.0783 23.9756C14.8057 24.2479 14.4816 24.4639 14.1247 24.6114C13.7677 24.7588 13.3849 24.8347 12.9983 24.8347C12.6117 24.8347 12.2289 24.7588 11.872 24.6114C11.515 24.4639 11.1909 24.2479 10.9183 23.9756L9.98499 23.0485C9.43578 22.5061 8.69285 22.2014 7.91832 22.201H6.58499C5.80702 22.201 5.06092 21.894 4.51081 21.3476C3.9607 20.8012 3.65166 20.0601 3.65166 19.2874V17.9631C3.65121 17.1938 3.34446 16.4559 2.79832 15.9104L1.86499 14.9833C1.59086 14.7126 1.37331 14.3907 1.22487 14.0361C1.07642 13.6816 1 13.3014 1 12.9174C1 12.5334 1.07642 12.1532 1.22487 11.7986C1.37331 11.4441 1.59086 11.1222 1.86499 10.8514L2.79832 9.92436C3.34446 9.37886 3.65121 8.64095 3.65166 7.87164V6.5473Z"
+                fill="#DDF933"/>
+              <path d="M8.98499 16.8775L16.985 8.93147Z" fill="#DDF933"/>
+              <path
+                d="M9.65165 10.2558C10.0198 10.2558 10.3183 9.95934 10.3183 9.59364C10.3183 9.22793 10.0198 8.93147 9.65165 8.93147C9.28346 8.93147 8.98499 9.22793 8.98499 9.59364C8.98499 9.95934 9.28346 10.2558 9.65165 10.2558Z"
+                fill="#DDF933"/>
+              <path
+                d="M16.3183 16.8768C16.6865 16.8768 16.985 16.5804 16.985 16.2147C16.985 15.849 16.6865 15.5525 16.3183 15.5525C15.9501 15.5525 15.6517 15.849 15.6517 16.2147C15.6517 16.5804 15.9501 16.8768 16.3183 16.8768Z"
+                fill="#DDF933"/>
+              <path
+                d="M8.98499 16.8775L16.985 8.93147M3.65166 6.5473C3.65166 5.77459 3.9607 5.03352 4.51081 4.48712C5.06092 3.94073 5.80702 3.63376 6.58499 3.63376H7.91832C8.69285 3.63332 9.43578 3.32864 9.98499 2.78619L10.9183 1.85915C11.1909 1.58687 11.515 1.37079 11.872 1.22335C12.2289 1.0759 12.6117 1 12.9983 1C13.3849 1 13.7677 1.0759 14.1247 1.22335C14.4816 1.37079 14.8057 1.58687 15.0783 1.85915L16.0117 2.78619C16.5609 3.32864 17.3038 3.63332 18.0783 3.63376H19.4117C20.1896 3.63376 20.9357 3.94073 21.4858 4.48712C22.0359 5.03352 22.345 5.77459 22.345 6.5473V7.87164C22.3454 8.64095 22.6522 9.37886 23.1983 9.92436L24.1317 10.8514C24.4058 11.1222 24.6233 11.4441 24.7718 11.7986C24.9202 12.1532 24.9966 12.5334 24.9966 12.9174C24.9966 13.3014 24.9202 13.6816 24.7718 14.0361C24.6233 14.3907 24.4058 14.7126 24.1317 14.9833L23.1983 15.9104C22.6522 16.4559 22.3454 17.1938 22.345 17.9631V19.2874C22.345 20.0601 22.0359 20.8012 21.4858 21.3476C20.9357 21.894 20.1896 22.201 19.4117 22.201H18.0783C17.3038 22.2014 16.5609 22.5061 16.0117 23.0485L15.0783 23.9756C14.8057 24.2479 14.4816 24.4639 14.1247 24.6114C13.7677 24.7588 13.3849 24.8347 12.9983 24.8347C12.6117 24.8347 12.2289 24.7588 11.872 24.6114C11.515 24.4639 11.1909 24.2479 10.9183 23.9756L9.98499 23.0485C9.43578 22.5061 8.69285 22.2014 7.91832 22.201H6.58499C5.80702 22.201 5.06092 21.894 4.51081 21.3476C3.9607 20.8012 3.65166 20.0601 3.65166 19.2874V17.9631C3.65121 17.1938 3.34446 16.4559 2.79832 15.9104L1.86499 14.9833C1.59086 14.7126 1.37331 14.3907 1.22487 14.0361C1.07642 13.6816 1 13.3014 1 12.9174C1 12.5334 1.07642 12.1532 1.22487 11.7986C1.37331 11.4441 1.59086 11.1222 1.86499 10.8514L2.79832 9.92436C3.34446 9.37886 3.65121 8.64095 3.65166 7.87164V6.5473ZM10.3183 9.59364C10.3183 9.95934 10.0198 10.2558 9.65165 10.2558C9.28346 10.2558 8.98499 9.95934 8.98499 9.59364C8.98499 9.22793 9.28346 8.93147 9.65165 8.93147C10.0198 8.93147 10.3183 9.22793 10.3183 9.59364ZM16.985 16.2147C16.985 16.5804 16.6865 16.8768 16.3183 16.8768C15.9501 16.8768 15.6517 16.5804 15.6517 16.2147C15.6517 15.849 15.9501 15.5525 16.3183 15.5525C16.6865 15.5525 16.985 15.849 16.985 16.2147Z"
+                stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+            </svg>
+          </div>
+          <div class="main-copy flex-col justify-start items-start gap-2 inline-flex">
+            <div class="self-stretch text-black text-sm font-semibold leading-normal">
+              {{ index $recruitment "description"}}
+            </div>
+            <div class="text-[#8B9397] text-xs font-semibold leading-none">
+              {{ index $recruitment "fine" }}
+            </div>
+          </div>
+        </div>
+        <a href="{{ index $recruitment "link" }}" class="px-6 py-2 bg-[#6046FF] hover:!bg-[#4D38CC] rounded-3xl text-white text-center text-sm font-semibold">
+          {{ index $recruitment "cta" }}
+        </a>
       </div>
+    </div>
     {{ end }}
 
   </div>
@@ -106,4 +139,4 @@ <h3>Related content</h3>
 <!-- Feedback form for narrow screens -->
 <div class="print:hidden block md:hidden">
   {{ partial "feedback/form" }}
-</div>
+</div>