Updated per @mit-mit review

dart-lang · Feb 1, 2024 · f4ac23e · f4ac23e
1 parent 92ef020
commit f4ac23e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 85 deletions.
diff --git a/src/_includes/head.html b/src/_includes/head.html
@@ -66,7 +66,7 @@
   <link href="https://fonts.googleapis.com/css2?family=Google+Sans+Mono:wght@400;500;700&display=swap" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css2?family=Google+Sans+Text:wght@400;500;700&display=swap" rel="stylesheet">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons&display=swap" rel="stylesheet">
-
+  
   <link rel="stylesheet" href="{{ '/assets/css/main.css' | append: cache_bust }}">
   {% if page.css -%}
   {% for cssFile in page.css -%}

diff --git a/src/get-dart/_linux.md b/src/get-dart/_linux.md
@@ -1,32 +1,4 @@
 
-
-### System requirements
-{: .no_toc}
-
-Dart supports the following hardware architectures and platform versions
-to develop and run Dart code on Linux.
-
-#### Hardware architecture
-{: .no_toc}
-
-Dart supports the following CPU architectures on Linux.
-
-| Platform | x86 | x64 | ARM | ARM64     | RISC-V    |
-|----------|-----|-----|-----|-----------|-----------|
-| Linux    | Yes | Yes | Yes | Yes       | Dev, Beta |
-{:.table .table-striped}
-
-#### Operating system flavor and version
-{: .no_toc}
-
-Dart supports the [Debian stable][] and [Ubuntu LTS][] under standard
-support.
-
-| Platform | OS Versions                              |
-|----------|------------------------------------------|
-| Linux    | [Debian stable][], [Ubuntu LTS][]        |
-{:.table .table-striped}
-
 ### Install using package manager
 {: .no_toc}
 

diff --git a/src/get-dart/_mac.md b/src/get-dart/_mac.md
@@ -1,30 +1,4 @@
 
-### System requirements
-{: .no_toc}
-
-Dart supports the following hardware architectures and platform versions
-to develop and run Dart code on macOS.
-
-#### Hardware architecture
-{: .no_toc}
-
-Dart supports the following CPU architectures.
-
-| Platform | x86 | x64 | ARM | ARM64 | RISC-V |
-|----------|-----|-----|-----|-------|--------|
-| macOS    | No  | Yes | No  | Yes   | No     |
-{:.table .table-striped}
-
-#### Operating system
-{: .no_toc}
-
-Dart supports the latest three major versions of macOS.
-
-| Platform | OS Versions                              |
-|----------|------------------------------------------|
-| macOS    | {% for version in site.data.macos %}{% if version.eol != false %}{% break %}{%- else -%}{{version.cycle}} ({{version.codename}}){% endif %}{% if version.eol != false %}, {% endif %}{% endfor %} |
-{:.table .table-striped}
-
 ### Install using Homebrew
 {: .no_toc}
 

diff --git a/src/get-dart/_windows.md b/src/get-dart/_windows.md
@@ -1,30 +1,4 @@
 
-### System requirements
-{: .no_toc}
-
-Dart supports the following hardware architectures and platform versions
-to develop and run Dart code on Windows.
-
-#### Hardware architecture
-{: .no_toc}
-
-Dart supports the following CPU architectures on Windows.
-
-| Platform | x86 | x64 | ARM | ARM64     | RISC-V    |
-|----------|-----|-----|-----|-----------|-----------|
-| Windows  | Yes | Yes | No  | Dev, Beta | No        |
-{:.table .table-striped}
-
-#### Operating system
-{: .no_toc}
-
-Dart supports 32-bit and 64-bit Windows 10 and Windows 11.
-
-| Platform | OS Versions |
-|----------|-------------|
-| Windows  | 10, 11      |
-{:.table .table-striped}
-
 ### Install using Chocolatey
 {: .no_toc}
 

diff --git a/src/get-dart/index.md b/src/get-dart/index.md
@@ -12,6 +12,31 @@ The Dart SDK includes the libraries and command-line tools that you need to deve
 
 To learn more about the Dart SDK, see the [Dart SDK overview](/tools/sdk).
 
+## System requirements
+
+Dart supports the following hardware architectures and platform versions
+to develop and run Dart code.
+
+{% assign yes = '<span class="material-icons" style="color: #158477;">verified</span>' %}
+{% assign no = '<span class="material-icons" style="color: #D43324">dangerous</span>' %}
+{% assign beta = '<span class="material-icons" style="color: #13C2AD">gpp_maybe</span>' %}
+{% assign macversions = '' %}
+{% for version in site.data.macos limit:3 %}
+{%- if version.eol == false -%}
+{% assign macversions = macversions | append: version.cycle | append: ' (' | append: version.codename  | append: ')' %}
+{%- unless forloop.last -%}{% assign macversions = macversions | append: ', ' %}{% endunless -%}
+{%- endif %}
+{% endfor %}
+
+| Platform |   x86   |   x64   |   ARM   |   ARM64   | RISC-V    | OS Versions                              |
+|----------|---------|---------|---------|-----------|-----------|------------------------------------------|
+| Windows  | {{yes}} | {{yes}} | {{no}}  | {{beta}} | {{no}}    | 10 (32-bit, 64-bit), 11                                   |
+| Linux    | {{yes}} | {{yes}} | {{yes}} | {{yes}}   | {{beta}} | [Debian stable][], [Ubuntu LTS][]        |
+| macOS    | {{no}}  | {{yes}} | {{no}}  | {{yes}}   | {{no}}    | {{macversions}} |
+{:.table .table-striped}
+
+{{beta}} Supported in Dev, Beta channels only.
+
 ## Choose an install option
 
 To install and update the Dart SDK from the stable channel,
@@ -20,6 +45,7 @@ choose one of the following options:
 1. [Use a package manager](#install) (Recommended).
 1. [Build the SDK from source][build-source]
 1. Use a [Dart Docker image][dart-docker]
+1. Download from the [SDK Archive](/get-dart/archive)
 
 {% comment %}
 NOTE to editors: Keep the zip file link as the last thing in the paragraph,
@@ -30,7 +56,7 @@ so it's easy to find (but not more tempting than package managers).
 {% include_relative archive/_sdk-terms.md %}
 {{site.alert.end}}
 
-## Install the Dart SDK {#install}
+## Install the Dart SDK using a package manager {#install}
 
 The Flutter SDK includes the full Dart SDK including the
 [`dart`](/tools/dart-tool) CLI tool in Flutter's `bin` folder.
@@ -98,11 +124,8 @@ follow the [instructions on this page](#install)
 
 {% endfor -%}
 
-[SDK constraints]: /tools/pub/pubspec#sdk-constraints
 [build-source]: https://github.com/dart-lang/sdk/wiki/Building
-[Dart libraries]: /libraries
 [dart-docker]: https://hub.docker.com/_/dart
 [dl-sdk]: /get-dart/archive
-[flutter]: https://flutter.dev/docs/get-started/install
 [site SDK version]: {{site.dart-api}}/{{site.data.pkg-vers.SDK.channel}}/{{site.data.pkg-vers.SDK.vers}}/index.html
 [a package manager]: https://github.com/dart-lang/sdk/wiki/Installing-beta-and-dev-releases-with-brew,-choco,-and-apt-get