From 7ff0bee2a837cc45dea9e4ea2d4e8f85520783f5 Mon Sep 17 00:00:00 2001 From: Alexander Sandberg Date: Sat, 13 May 2023 12:17:53 +0200 Subject: [PATCH 1/8] fix latest release button smaller than rest when column --- assets/stylesheets/pages/_landing.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/stylesheets/pages/_landing.scss b/assets/stylesheets/pages/_landing.scss index e975194fb..ef83e53bb 100644 --- a/assets/stylesheets/pages/_landing.scss +++ b/assets/stylesheets/pages/_landing.scss @@ -55,9 +55,11 @@ .flex-container { display: flex; flex-direction: column; + align-items: center; height: 100%; .latest-release-container { + height: 64px; flex-grow: 1; display: flex; align-items: center; From 8343e49e398d891da5e137fda9e9fa4ea9746257 Mon Sep 17 00:00:00 2001 From: Alexander Sandberg Date: Sat, 13 May 2023 16:35:40 +0200 Subject: [PATCH 2/8] WIP: add featured snippets to landing page --- _data/featured_snippets.yml | 50 ++++++++++++++++++++++++++ assets/stylesheets/pages/_landing.scss | 19 ++++++++++ index.md | 16 +++++++++ 3 files changed, 85 insertions(+) create mode 100644 _data/featured_snippets.yml diff --git a/_data/featured_snippets.yml b/_data/featured_snippets.yml new file mode 100644 index 000000000..7ce58a8f1 --- /dev/null +++ b/_data/featured_snippets.yml @@ -0,0 +1,50 @@ +- | + let names = ["Anna", "Alex", "Brian", "Jack"] + for name in names { + print("Hello, \(name)!") + } + // Hello, Anna! + // Hello, Alex! + // Hello, Brian! + // Hello, Jack! +- | + func greet(person: String, alreadyGreeted: Bool) -> String { + if alreadyGreeted { + return greetAgain(person: person) + } else { + return greet(person: person) + } + } + print(greet(person: "Tim", alreadyGreeted: true)) + // Prints "Hello again, Tim!" +- | + enum CompassPoint { + case north, south, east, west + mutating func turnNorth() { + self = .north + } + } + var currentDirection = CompassPoint.west + let rememberedDirection = currentDirection + currentDirection.turnNorth() + + print("The current direction is \(currentDirection)") + print("The remembered direction is \(rememberedDirection)") + // Prints "The current direction is north" + // Prints "The remembered direction is west" +- | + func oneMore(than number: Int) -> Int { + return number + 1 + } + + var myNumber = 1 + myNumber = oneMore(than: myNumber) + print(myNumber) + // Prints "2" +- | + enum Beverage: CaseIterable { + case coffee, tea, juice + } + let numberOfChoices = Beverage.allCases.count + print("\(numberOfChoices) beverages available") + // Prints "3 beverages available" diff --git a/assets/stylesheets/pages/_landing.scss b/assets/stylesheets/pages/_landing.scss index ef83e53bb..f4dcdb478 100644 --- a/assets/stylesheets/pages/_landing.scss +++ b/assets/stylesheets/pages/_landing.scss @@ -25,6 +25,25 @@ } } +.featured-snippet { + display: none; + + &.visible { + display: block; + } + + &.highlighter-rouge { + margin-left: 0px; + } + + pre { + border: 1px solid var(--color-fill-tertiary); + border-radius: 4px; + padding: 1.25rem 1.5rem; + margin: 0px; + } +} + .link-grid { ul { display: grid; diff --git a/index.md b/index.md index 5390e6679..fe131c2a2 100644 --- a/index.md +++ b/index.md @@ -62,6 +62,13 @@ Swift is a general-purpose programming language built using a modern approach to +{% for snippet in site.data.featured_snippets %} +```swift +{{ snippet -}} +``` +{: class="featured-snippet {% if forloop.first %}visible{% endif %}" } +{% endfor %} +
- [Learn more about Swift](/about)
@@ -126,3 +133,12 @@ Stay up-to-date with the latest in the Swift community. - [Visit the Swift forums](https://forums.swift.org) - [Follow @Swiftlang on Twitter](https://twitter.com/swiftlang){:target="_blank" class="link-external"} + + From 524c9e31a2b706688da469f50167d448d7b53ada Mon Sep 17 00:00:00 2001 From: Alexander Sandberg Date: Sat, 13 May 2023 17:04:32 +0200 Subject: [PATCH 3/8] ensure that snippet visibility rules are not overridden --- assets/stylesheets/pages/_landing.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/stylesheets/pages/_landing.scss b/assets/stylesheets/pages/_landing.scss index f4dcdb478..73ab31b22 100644 --- a/assets/stylesheets/pages/_landing.scss +++ b/assets/stylesheets/pages/_landing.scss @@ -26,10 +26,10 @@ } .featured-snippet { - display: none; + display: none !important; &.visible { - display: block; + display: block !important; } &.highlighter-rouge { From b7948031bc3fb9c33907ef46315e5c0d044f77e9 Mon Sep 17 00:00:00 2001 From: Alexander Sandberg Date: Sat, 13 May 2023 17:04:37 +0200 Subject: [PATCH 4/8] formatting --- index.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/index.md b/index.md index fe131c2a2..95c69f9de 100644 --- a/index.md +++ b/index.md @@ -135,10 +135,10 @@ Stay up-to-date with the latest in the Swift community. From 3404e6138176a9d227dd93f4be16739aa898873d Mon Sep 17 00:00:00 2001 From: Alexander Sandberg Date: Wed, 17 May 2023 11:01:57 +0200 Subject: [PATCH 5/8] remove important from css rules --- assets/stylesheets/pages/_landing.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/stylesheets/pages/_landing.scss b/assets/stylesheets/pages/_landing.scss index 73ab31b22..f4dcdb478 100644 --- a/assets/stylesheets/pages/_landing.scss +++ b/assets/stylesheets/pages/_landing.scss @@ -26,10 +26,10 @@ } .featured-snippet { - display: none !important; + display: none; &.visible { - display: block !important; + display: block; } &.highlighter-rouge { From 7a0de5094e15c141c60def8c4e0cfeae72fd13df Mon Sep 17 00:00:00 2001 From: Alexander Sandberg Date: Thu, 22 Jun 2023 08:26:51 +0200 Subject: [PATCH 6/8] add height to featured snippet to prevent layout shifts --- assets/stylesheets/pages/_landing.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/stylesheets/pages/_landing.scss b/assets/stylesheets/pages/_landing.scss index f4dcdb478..65e656de6 100644 --- a/assets/stylesheets/pages/_landing.scss +++ b/assets/stylesheets/pages/_landing.scss @@ -37,6 +37,7 @@ } pre { + height: 15rem; border: 1px solid var(--color-fill-tertiary); border-radius: 4px; padding: 1.25rem 1.5rem; From 808599bf7cc00fb09edb84950ed43e365c5d64ee Mon Sep 17 00:00:00 2001 From: Alexander Sandberg Date: Thu, 22 Jun 2023 08:27:01 +0200 Subject: [PATCH 7/8] move snippet to top of landing page --- index.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/index.md b/index.md index 95c69f9de..1bb743cc1 100644 --- a/index.md +++ b/index.md @@ -8,6 +8,13 @@ atom: true Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns. +{% for snippet in site.data.featured_snippets %} +```swift +{{ snippet -}} +``` +{: class="featured-snippet {% if forloop.first %}visible{% endif %}" } +{% endfor %} +
  • @@ -62,13 +69,6 @@ Swift is a general-purpose programming language built using a modern approach to
-{% for snippet in site.data.featured_snippets %} -```swift -{{ snippet -}} -``` -{: class="featured-snippet {% if forloop.first %}visible{% endif %}" } -{% endfor %} -
- [Learn more about Swift](/about)
From 4ff77fe93f4ccc140bdd1d0a50296ad6142338cd Mon Sep 17 00:00:00 2001 From: Alexander Sandberg Date: Thu, 22 Jun 2023 08:27:09 +0200 Subject: [PATCH 8/8] remove long snippet example --- _data/featured_snippets.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/_data/featured_snippets.yml b/_data/featured_snippets.yml index 7ce58a8f1..a229f0edd 100644 --- a/_data/featured_snippets.yml +++ b/_data/featured_snippets.yml @@ -17,21 +17,6 @@ } print(greet(person: "Tim", alreadyGreeted: true)) // Prints "Hello again, Tim!" -- | - enum CompassPoint { - case north, south, east, west - mutating func turnNorth() { - self = .north - } - } - var currentDirection = CompassPoint.west - let rememberedDirection = currentDirection - currentDirection.turnNorth() - - print("The current direction is \(currentDirection)") - print("The remembered direction is \(rememberedDirection)") - // Prints "The current direction is north" - // Prints "The remembered direction is west" - | func oneMore(than number: Int) -> Int { return number + 1