From fa7b735a72038a48e84ae6b84db7a28e5740606e Mon Sep 17 00:00:00 2001 From: Federico Bucchi Date: Wed, 28 May 2025 17:25:22 -0700 Subject: [PATCH 1/7] Remove arrows from links --- _includes/new-includes/components/callout.html | 2 +- _includes/new-includes/components/card-grid.html | 6 +++--- _includes/new-includes/components/code-box.html | 2 +- _includes/new-includes/components/linux-releases.html | 6 +++--- get-started/storybook/index.md | 2 +- install/linux/index.md | 2 +- install/macos/index.md | 4 ++-- install/windows/index.md | 2 +- use-case/index.md | 6 +++--- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/_includes/new-includes/components/callout.html b/_includes/new-includes/components/callout.html index d4f0fd8a7..e055e754e 100644 --- a/_includes/new-includes/components/callout.html +++ b/_includes/new-includes/components/callout.html @@ -22,7 +22,7 @@

{{ include.title }}

{% endif %} {% assign links = include.links %} {% if links %}
{% for link in links %} - {{ link.text }} + {{ link.text }} {% endfor %}
{% endif %} diff --git a/_includes/new-includes/components/card-grid.html b/_includes/new-includes/components/card-grid.html index 056439c33..10f26350f 100644 --- a/_includes/new-includes/components/card-grid.html +++ b/_includes/new-includes/components/card-grid.html @@ -17,7 +17,7 @@

{{ include.content.title }}

{{ card.name }} {{ card.text }} - {{ card.link_text }} + {{ card.link_text }}
{% endfor %} @@ -30,7 +30,7 @@

{{ include.content.title }}

{{ card.name }} {{ card.text }} - {{ card.link_text }} + {{ card.link_text }}
{% endfor %} @@ -45,7 +45,7 @@

{{ include.content.title }}

{{ card.name }} {{ card.text }} - {{ card.link_text }} + {{ card.link_text }}
{% endfor %} diff --git a/_includes/new-includes/components/code-box.html b/_includes/new-includes/components/code-box.html index da820fb20..c4eb40b06 100644 --- a/_includes/new-includes/components/code-box.html +++ b/_includes/new-includes/components/code-box.html @@ -26,7 +26,7 @@

{{include.content.headline}}

{% endif %}{% if include.content.links %}
{% for link in include.content.links %} - {{ link.copy }} + {{ link.copy }} {% endfor %}
{% endif %} diff --git a/_includes/new-includes/components/linux-releases.html b/_includes/new-includes/components/linux-releases.html index b95112c7e..cb2baeed3 100644 --- a/_includes/new-includes/components/linux-releases.html +++ b/_includes/new-includes/components/linux-releases.html @@ -38,12 +38,12 @@

Development Snapshots

- Instructions (Tarball) + Instructions (Tarball)

- Instructions (Docker) + Instructions (Docker)

@@ -61,7 +61,7 @@

Development Snapshots

Static Linux SDK

- Instructions + Instructions

diff --git a/get-started/storybook/index.md b/get-started/storybook/index.md index d5582efef..eeb3b4fd4 100644 --- a/get-started/storybook/index.md +++ b/get-started/storybook/index.md @@ -46,7 +46,7 @@ title: Storybook {% include new-includes/components/code-box.html content = site.data.new-data.get-started.storybook.code-box-with-tabs with-tabs = true %}
- Stand alone link + Stand alone link
diff --git a/install/linux/index.md b/install/linux/index.md index 6a04f4749..d2991c93e 100644 --- a/install/linux/index.md +++ b/install/linux/index.md @@ -21,7 +21,7 @@ title: Install Swift - Linux

Looking for alternate installation options?

- Check them out + Check them out

diff --git a/install/macos/index.md b/install/macos/index.md index a9722282f..2ceadaab9 100644 --- a/install/macos/index.md +++ b/install/macos/index.md @@ -49,7 +49,7 @@ title: Install Swift - macOS

Toolchain

- Instructions + Instructions

@@ -67,7 +67,7 @@ title: Install Swift - macOS

Static Linux SDK

- Instructions + Instructions

diff --git a/install/windows/index.md b/install/windows/index.md index a04e4bd54..de631728c 100644 --- a/install/windows/index.md +++ b/install/windows/index.md @@ -48,7 +48,7 @@ title: Install Swift - Windows

- Instructions + Instructions

diff --git a/use-case/index.md b/use-case/index.md index df8a13131..4ac0d1d63 100644 --- a/use-case/index.md +++ b/use-case/index.md @@ -34,7 +34,7 @@ title: Use case
{{ package.name }} {{ package.text }} - {{ package.link_text }} + {{ package.link_text }}
{% endfor %} @@ -45,11 +45,11 @@ title: Use case
{{ package.name }} {{ package.text }} - {{ package.link_text }} + {{ package.link_text }}
{% endfor %} - {{ frameworks_packages.link_text }} + {{ frameworks_packages.link_text }}
From 2967dc6fa3f8bed80a36b80cc70234b5320bcbb5 Mon Sep 17 00:00:00 2001 From: Federico Bucchi Date: Wed, 28 May 2025 17:29:02 -0700 Subject: [PATCH 2/7] Add Editors link --- _data/new-data/install/linux/releases.yml | 4 +++- _data/new-data/install/macos/releases.yml | 2 ++ _data/new-data/install/windows/releases.yml | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/_data/new-data/install/linux/releases.yml b/_data/new-data/install/linux/releases.yml index f6254a031..982c06361 100644 --- a/_data/new-data/install/linux/releases.yml +++ b/_data/new-data/install/linux/releases.yml @@ -2,7 +2,7 @@ latest-release: swiftly: pre-code-text: | The Swiftly installer manages Swift and its dependencies. It supports switching between different versions and downloading updates. - headline: Swiftly (recommended) + headline: Swiftly tabs: - label: Bash code: |- @@ -18,6 +18,8 @@ latest-release: copy: 'PGP: Signature' - href: 'https://www.swift.org/install/linux/swiftly' copy: 'Instructions' + - href: "https://www.swift.org/tools/#editors" + copy: "Editors" container: pre-code-text: |- If you prefer a containerized environment, you can download the official container images for compiling and running Swift on a variety of distributions. diff --git a/_data/new-data/install/macos/releases.yml b/_data/new-data/install/macos/releases.yml index 2e352df58..9ef39afa1 100644 --- a/_data/new-data/install/macos/releases.yml +++ b/_data/new-data/install/macos/releases.yml @@ -16,6 +16,8 @@ latest-release: copy: 'License: Apache-2.0' - href: 'https://www.swift.org/install/macos/swiftly' copy: 'Instructions' + - href: "https://www.swift.org/tools/#editors" + copy: "Editors" xcode: pre-code-text: To develop with Swift for Apple platforms, download the latest version of Xcode, which is regularly refreshed with the latest Swift toolchain. headline: Xcode diff --git a/_data/new-data/install/windows/releases.yml b/_data/new-data/install/windows/releases.yml index 9e8710e0e..83586e49c 100644 --- a/_data/new-data/install/windows/releases.yml +++ b/_data/new-data/install/windows/releases.yml @@ -2,7 +2,7 @@ latest-release: winget: pre-code-text: | Install Swift via the Windows Package Manager (also known as WinGet). - headline: WinGet (recommended) + headline: WinGet after-code-text: | First, install Windows platform dependencies: 
winget install --id Microsoft.VisualStudio.2022.Community --exact --force
@@ -16,6 +16,8 @@ latest-release:
     links:
       - href: "/install/windows/winget/"
         copy: "Instructions"
+      - href: "https://www.swift.org/tools/#editors"
+        copy: "Editors"
   manual:
     pre-code-text: |
       Download the Swift installer (.exe).

From 22f76df836a1bac44efc99bdcbb8426ef1f75f9f Mon Sep 17 00:00:00 2001
From: Federico Bucchi 
Date: Wed, 28 May 2025 17:52:11 -0700
Subject: [PATCH 3/7] Fix not showing Bash tab in mobile

---
 assets/stylesheets/new-stylesheets/pages/_get-started.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/assets/stylesheets/new-stylesheets/pages/_get-started.scss b/assets/stylesheets/new-stylesheets/pages/_get-started.scss
index 4f3d1f3e0..5f02964e8 100644
--- a/assets/stylesheets/new-stylesheets/pages/_get-started.scss
+++ b/assets/stylesheets/new-stylesheets/pages/_get-started.scss
@@ -481,7 +481,6 @@
       ul {
         white-space: nowrap;
         width: calc(100% - 59px);
-        overflow: scroll;
       }
     }
   }

From 805731590fc2df1f0d4a0d6fb19e7ec921aac59c Mon Sep 17 00:00:00 2001
From: Federico Bucchi 
Date: Wed, 28 May 2025 17:56:32 -0700
Subject: [PATCH 4/7] Change copy for container

---
 .../install/linux/amazon-linux/amazon-linux-2/releases.yml    | 4 ++--
 _data/new-data/install/linux/debian/debian-12/releases.yml    | 4 ++--
 _data/new-data/install/linux/fedora/fedora-39/releases.yml    | 4 ++--
 _data/new-data/install/linux/ubi/ubi-9/releases.yml           | 4 ++--
 _data/new-data/install/linux/ubuntu/ubuntu-20-04/releases.yml | 4 ++--
 _data/new-data/install/linux/ubuntu/ubuntu-22-04/releases.yml | 4 ++--
 _data/new-data/install/linux/ubuntu/ubuntu-24-04/releases.yml | 4 ++--
 _data/new-data/install/windows/releases.yml                   | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/_data/new-data/install/linux/amazon-linux/amazon-linux-2/releases.yml b/_data/new-data/install/linux/amazon-linux/amazon-linux-2/releases.yml
index db0c46eca..1ab4bbf34 100644
--- a/_data/new-data/install/linux/amazon-linux/amazon-linux-2/releases.yml
+++ b/_data/new-data/install/linux/amazon-linux/amazon-linux-2/releases.yml
@@ -1,8 +1,8 @@
 latest-release:
   docker:
     pre-code-text: |
-      The official Docker images for Swift.
-    headline: Docker
+      If you prefer a containerized environment, you can download the official container images for compiling and running Swift on a variety of distributions.
+    headline: Container
     links:
       - href: 'https://hub.docker.com/_/swift'
         copy: '6.1-amazonlinux2'
diff --git a/_data/new-data/install/linux/debian/debian-12/releases.yml b/_data/new-data/install/linux/debian/debian-12/releases.yml
index 6582f45a3..396a83329 100644
--- a/_data/new-data/install/linux/debian/debian-12/releases.yml
+++ b/_data/new-data/install/linux/debian/debian-12/releases.yml
@@ -1,8 +1,8 @@
 latest-release:
   docker:
     pre-code-text: |
-      The official Docker images for Swift.
-    headline: Docker
+      If you prefer a containerized environment, you can download the official container images for compiling and running Swift on a variety of distributions.
+    headline: Container
     links:
       - href: 'https://hub.docker.com/_/swift'
         copy: '6.1-debian12'
diff --git a/_data/new-data/install/linux/fedora/fedora-39/releases.yml b/_data/new-data/install/linux/fedora/fedora-39/releases.yml
index 298448407..2da56f9f0 100644
--- a/_data/new-data/install/linux/fedora/fedora-39/releases.yml
+++ b/_data/new-data/install/linux/fedora/fedora-39/releases.yml
@@ -1,8 +1,8 @@
 latest-release:
   docker:
     pre-code-text: |
-      The official Docker images for Swift.
-    headline: Docker
+      If you prefer a containerized environment, you can download the official container images for compiling and running Swift on a variety of distributions.
+    headline: Container
     links:
       - href: 'https://hub.docker.com/_/swift'
         copy: '6.1.1-fedora39'
diff --git a/_data/new-data/install/linux/ubi/ubi-9/releases.yml b/_data/new-data/install/linux/ubi/ubi-9/releases.yml
index 663b3ada3..f63f8fc31 100644
--- a/_data/new-data/install/linux/ubi/ubi-9/releases.yml
+++ b/_data/new-data/install/linux/ubi/ubi-9/releases.yml
@@ -1,8 +1,8 @@
 latest-release:
   docker:
     pre-code-text: |
-      The official Docker images for Swift.
-    headline: Docker
+      If you prefer a containerized environment, you can download the official container images for compiling and running Swift on a variety of distributions.
+    headline: Container
     links:
       - href: 'https://hub.docker.com/_/swift'
         copy: '6.1.1-rhel-ubi9'
diff --git a/_data/new-data/install/linux/ubuntu/ubuntu-20-04/releases.yml b/_data/new-data/install/linux/ubuntu/ubuntu-20-04/releases.yml
index 96553de6d..54691d67f 100644
--- a/_data/new-data/install/linux/ubuntu/ubuntu-20-04/releases.yml
+++ b/_data/new-data/install/linux/ubuntu/ubuntu-20-04/releases.yml
@@ -1,8 +1,8 @@
 latest-release:
   docker:
     pre-code-text: |
-      The official Docker images for Swift.
-    headline: Docker
+      If you prefer a containerized environment, you can download the official container images for compiling and running Swift on a variety of distributions.
+    headline: Container
     links:
       - href: 'https://hub.docker.com/_/swift'
         copy: '6.1.1-focal'
diff --git a/_data/new-data/install/linux/ubuntu/ubuntu-22-04/releases.yml b/_data/new-data/install/linux/ubuntu/ubuntu-22-04/releases.yml
index b8195667e..6070c0fbe 100644
--- a/_data/new-data/install/linux/ubuntu/ubuntu-22-04/releases.yml
+++ b/_data/new-data/install/linux/ubuntu/ubuntu-22-04/releases.yml
@@ -1,8 +1,8 @@
 latest-release:
   docker:
     pre-code-text: |
-      The official Docker images for Swift.
-    headline: Docker
+      If you prefer a containerized environment, you can download the official container images for compiling and running Swift on a variety of distributions.
+    headline: Container
     links:
       - href: 'https://hub.docker.com/_/swift'
         copy: '6.1.1-jammy'
diff --git a/_data/new-data/install/linux/ubuntu/ubuntu-24-04/releases.yml b/_data/new-data/install/linux/ubuntu/ubuntu-24-04/releases.yml
index e5b01ba55..96d3c8b76 100644
--- a/_data/new-data/install/linux/ubuntu/ubuntu-24-04/releases.yml
+++ b/_data/new-data/install/linux/ubuntu/ubuntu-24-04/releases.yml
@@ -1,8 +1,8 @@
 latest-release:
   docker:
     pre-code-text: |
-      The official Docker images for Swift.
-    headline: Docker
+      If you prefer a containerized environment, you can download the official container images for compiling and running Swift on a variety of distributions.
+    headline: Container
     links:
       - href: 'https://hub.docker.com/_/swift'
         copy: '6.1.1-noble'
diff --git a/_data/new-data/install/windows/releases.yml b/_data/new-data/install/windows/releases.yml
index 83586e49c..ee31c220a 100644
--- a/_data/new-data/install/windows/releases.yml
+++ b/_data/new-data/install/windows/releases.yml
@@ -31,8 +31,8 @@ latest-release:
         copy: 'Instructions'
   docker:
     pre-code-text: |
-      The official Docker images for Swift.
-    headline: Docker
+      If you prefer a containerized environment, you can download the official container images for compiling and running Swift on a variety of distributions.
+    headline: Container
     links:
       - href: 'https://hub.docker.com/_/swift'
         copy: '6.1-windowsservercore-ltsc2022'

From 162b597806610ace8d896185fd8a6f4fe6bd10be Mon Sep 17 00:00:00 2001
From: Federico Bucchi 
Date: Wed, 28 May 2025 17:59:13 -0700
Subject: [PATCH 5/7] Remove Latest Release

---
 _includes/new-includes/components/linux-releases.html | 1 -
 install/linux/index.md                                | 1 -
 install/macos/index.md                                | 1 -
 install/windows/index.md                              | 1 -
 4 files changed, 4 deletions(-)

diff --git a/_includes/new-includes/components/linux-releases.html b/_includes/new-includes/components/linux-releases.html
index cb2baeed3..8ec94a0b5 100644
--- a/_includes/new-includes/components/linux-releases.html
+++ b/_includes/new-includes/components/linux-releases.html
@@ -1,5 +1,4 @@
 

-  
Latest release

   

     

       

diff --git a/install/linux/index.md b/install/linux/index.md
index d2991c93e..4e96ab119 100644
--- a/install/linux/index.md
+++ b/install/linux/index.md
@@ -6,7 +6,6 @@ title: Install Swift - Linux
 ---
 
 

-  
Latest release

   

     

       {% include new-includes/components/code-box.html content = site.data.new-data.install.linux.releases.latest-release.swiftly %}
diff --git a/install/macos/index.md b/install/macos/index.md
index 2ceadaab9..067f660b5 100644
--- a/install/macos/index.md
+++ b/install/macos/index.md
@@ -9,7 +9,6 @@ title: Install Swift - macOS
 {% assign xcode_6_2_builds = site.data.builds.swift-6_2-branch.xcode | sort: 'date' | reverse %}
 
 

-  
Latest release

   

     

       {% include new-includes/components/code-box.html content = site.data.new-data.install.macos.releases.latest-release.swiftly%}
diff --git a/install/windows/index.md b/install/windows/index.md
index de631728c..915490178 100644
--- a/install/windows/index.md
+++ b/install/windows/index.md
@@ -11,7 +11,6 @@ title: Install Swift - Windows
 {% assign windows10_arm64_6_1_builds = site.data.builds.swift-6_1-branch.windows10-arm64 | sort: 'date' | reverse %}
 
 

-  
Latest release

   

     

       {% include new-includes/components/code-box.html content = site.data.new-data.install.windows.releases.latest-release.winget %}

From e0c3d8dc8d7afa23356b8275c775904af89f63e0 Mon Sep 17 00:00:00 2001
From: Federico Bucchi 
Date: Wed, 28 May 2025 18:17:37 -0700
Subject: [PATCH 6/7] Change link to Alternate Install Options

---
 _includes/new-includes/components/linux-os-selection.html | 2 +-
 install/linux/index.md                                    | 3 +--
 install/macos/index.md                                    | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/_includes/new-includes/components/linux-os-selection.html b/_includes/new-includes/components/linux-os-selection.html
index c79c71825..e19c24240 100644
--- a/_includes/new-includes/components/linux-os-selection.html
+++ b/_includes/new-includes/components/linux-os-selection.html
@@ -1,5 +1,5 @@
 

-  
Alternate installation options

+  
Alternate Install Options

 
   {% assign platforms = site.data.new-data.install.linux.os-names %} {% assign
   url_parts = page.url | split: '/' %} {% assign selected_os = url_parts[3] %}
diff --git a/install/linux/index.md b/install/linux/index.md
index 4e96ab119..b0aaccd03 100644
--- a/install/linux/index.md
+++ b/install/linux/index.md
@@ -17,10 +17,9 @@ title: Install Swift - Linux
     

   

   

-  
Looking for alternate installation options?

     
   

diff --git a/install/macos/index.md b/install/macos/index.md
index 067f660b5..0655221d8 100644
--- a/install/macos/index.md
+++ b/install/macos/index.md
@@ -19,7 +19,6 @@ title: Install Swift - macOS
       {% include new-includes/components/code-box.html content = site.data.new-data.install.macos.releases.latest-release.xcode%}
     

   

-  
Other install options

   

     

       


From dfda1127651291212aaadf251051ac5baf6dd3bd Mon Sep 17 00:00:00 2001
From: Federico Bucchi 
Date: Wed, 28 May 2025 18:29:22 -0700
Subject: [PATCH 7/7] Fix mobile table style

---
 assets/stylesheets/new-stylesheets/pages/_install.scss | 8 +++++---
 install/linux/index.md                                 | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/assets/stylesheets/new-stylesheets/pages/_install.scss b/assets/stylesheets/new-stylesheets/pages/_install.scss
index 677a68482..9c1eed76f 100644
--- a/assets/stylesheets/new-stylesheets/pages/_install.scss
+++ b/assets/stylesheets/new-stylesheets/pages/_install.scss
@@ -49,9 +49,11 @@
           @include link-with-right-arrow;
           margin-top: 10px;
           display: flex;
+          text-decoration: underline;
 
-          &.centered {
+          &.block {
             justify-content: center;
+            font-size: 2em;
           }
 
           i {
@@ -185,8 +187,8 @@
 
     table tr {
       display: block;
-      margin-bottom: 20px;
-      border: 1px solid #f2f2f2;
+      margin-bottom: 6px;
+      border-bottom: 1px solid #f2f2f2;
     }
 
     table td {
diff --git a/install/linux/index.md b/install/linux/index.md
index b0aaccd03..8e60a5069 100644
--- a/install/linux/index.md
+++ b/install/linux/index.md
@@ -19,7 +19,7 @@ title: Install Swift - Linux