Skip to content

Commit 1e5b057

Browse files
shahmishalshahmishal
authored
Merge pull request #1039 from swiftlang/redesign
Redesign
2 parents 65ff441 + df44e8b commit 1e5b057

File tree

260 files changed

+7545
-1436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+7545
-1436
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ xcuserdata
2222

2323
# VS Code files
2424
.vscode
25+
26+
# Npm modules
27+
node_modules

‎.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
assets/javascripts/new-javascripts/vendor/

‎.prettierrc‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
{
2-
"overrides": [
3-
{
4-
"files": [
5-
"**/*.css",
6-
"**/*.scss"
7-
],
8-
"options": {
9-
"tabWidth": 2,
10-
"useTabs": false
11-
}
12-
}
13-
]
2+
"tabWidth": 2,
3+
"useTabs": false,
4+
"singleQuote": true,
5+
"semi": false,
6+
"endOfLine": "lf"
147
}

‎404.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
---
2-
layout: page-wide
3-
title: "Not Found"
2+
layout: new-layouts/base
3+
title: Internal Server Error
44
permalink: /404.html
55
---
66

7-
The page you’re looking for can’t be found.
8-
7+
<section class="section">
8+
<h1>Not Found</h1>
9+
The page you're looking for can’t be found.
10+
</section>

‎500.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
---
2-
layout: page-wide
3-
title: "Internal Server Error"
2+
layout: new-layouts/base
3+
title: Internal Server Error
44
permalink: /500.html
55
---
66

7-
The server encountered an error and was unable to complete your request.
7+
<section class="section">
8+
<h1>Internal Server Error</h1>
9+
The server encountered an error and was unable to complete your request.
10+
</section>

‎Gemfile.lock‎

Lines changed: 1 addition & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,11 @@ GEM
1212
eventmachine (>= 0.12.9)
1313
http_parser.rb (~> 0)
1414
eventmachine (1.2.7)
15-
ffi (1.17.0)
16-
ffi (1.17.0-aarch64-linux-gnu)
17-
ffi (1.17.0-aarch64-linux-musl)
18-
ffi (1.17.0-arm-linux-gnu)
19-
ffi (1.17.0-arm-linux-musl)
2015
ffi (1.17.0-arm64-darwin)
21-
ffi (1.17.0-x86-linux-gnu)
22-
ffi (1.17.0-x86-linux-musl)
23-
ffi (1.17.0-x86_64-darwin)
24-
ffi (1.17.0-x86_64-linux-gnu)
25-
ffi (1.17.0-x86_64-linux-musl)
2616
forwardable-extended (2.6.0)
27-
google-protobuf (4.28.3)
28-
bigdecimal
29-
rake (>= 13)
30-
google-protobuf (4.28.3-aarch64-linux)
31-
bigdecimal
32-
rake (>= 13)
3317
google-protobuf (4.28.3-arm64-darwin)
3418
bigdecimal
3519
rake (>= 13)
36-
google-protobuf (4.28.3-x86-linux)
37-
bigdecimal
38-
rake (>= 13)
39-
google-protobuf (4.28.3-x86_64-darwin)
40-
bigdecimal
41-
rake (>= 13)
42-
google-protobuf (4.28.3-x86_64-linux)
43-
bigdecimal
44-
rake (>= 13)
4520
http_parser.rb (0.8.0)
4621
i18n (1.14.6)
4722
concurrent-ruby (~> 1.0)
@@ -86,84 +61,15 @@ GEM
8661
rexml (3.3.9)
8762
rouge (4.5.1)
8863
safe_yaml (1.0.5)
89-
sass-embedded (1.81.0)
90-
google-protobuf (~> 4.28)
91-
rake (>= 13)
92-
sass-embedded (1.81.0-aarch64-linux-android)
93-
google-protobuf (~> 4.28)
94-
sass-embedded (1.81.0-aarch64-linux-gnu)
95-
google-protobuf (~> 4.28)
96-
sass-embedded (1.81.0-aarch64-linux-musl)
97-
google-protobuf (~> 4.28)
98-
sass-embedded (1.81.0-aarch64-mingw-ucrt)
99-
google-protobuf (~> 4.28)
100-
sass-embedded (1.81.0-arm-linux-androideabi)
101-
google-protobuf (~> 4.28)
102-
sass-embedded (1.81.0-arm-linux-gnueabihf)
103-
google-protobuf (~> 4.28)
104-
sass-embedded (1.81.0-arm-linux-musleabihf)
105-
google-protobuf (~> 4.28)
10664
sass-embedded (1.81.0-arm64-darwin)
10765
google-protobuf (~> 4.28)
108-
sass-embedded (1.81.0-riscv64-linux-android)
109-
google-protobuf (~> 4.28)
110-
sass-embedded (1.81.0-riscv64-linux-gnu)
111-
google-protobuf (~> 4.28)
112-
sass-embedded (1.81.0-riscv64-linux-musl)
113-
google-protobuf (~> 4.28)
114-
sass-embedded (1.81.0-x86-cygwin)
115-
google-protobuf (~> 4.28)
116-
sass-embedded (1.81.0-x86-linux-android)
117-
google-protobuf (~> 4.28)
118-
sass-embedded (1.81.0-x86-linux-gnu)
119-
google-protobuf (~> 4.28)
120-
sass-embedded (1.81.0-x86-linux-musl)
121-
google-protobuf (~> 4.28)
122-
sass-embedded (1.81.0-x86-mingw-ucrt)
123-
google-protobuf (~> 4.28)
124-
sass-embedded (1.81.0-x86_64-cygwin)
125-
google-protobuf (~> 4.28)
126-
sass-embedded (1.81.0-x86_64-darwin)
127-
google-protobuf (~> 4.28)
128-
sass-embedded (1.81.0-x86_64-linux-android)
129-
google-protobuf (~> 4.28)
130-
sass-embedded (1.81.0-x86_64-linux-gnu)
131-
google-protobuf (~> 4.28)
132-
sass-embedded (1.81.0-x86_64-linux-musl)
133-
google-protobuf (~> 4.28)
13466
terminal-table (3.0.2)
13567
unicode-display_width (>= 1.1.1, < 3)
13668
unicode-display_width (2.6.0)
13769
webrick (1.9.0)
13870

13971
PLATFORMS
140-
aarch64-linux
141-
aarch64-linux-android
142-
aarch64-linux-gnu
143-
aarch64-linux-musl
144-
aarch64-mingw-ucrt
145-
arm-linux-androideabi
146-
arm-linux-gnu
147-
arm-linux-gnueabihf
148-
arm-linux-musl
149-
arm-linux-musleabihf
15072
arm64-darwin
151-
riscv64-linux-android
152-
riscv64-linux-gnu
153-
riscv64-linux-musl
154-
ruby
155-
x86-cygwin
156-
x86-linux
157-
x86-linux-android
158-
x86-linux-gnu
159-
x86-linux-musl
160-
x86-mingw-ucrt
161-
x86_64-cygwin
162-
x86_64-darwin
163-
x86_64-linux
164-
x86_64-linux-android
165-
x86_64-linux-gnu
166-
x86_64-linux-musl
16773

16874
DEPENDENCIES
16975
base64
@@ -174,4 +80,4 @@ DEPENDENCIES
17480
webrick (~> 1.7)
17581

17682
BUNDLED WITH
177-
2.5.23
83+
2.5.23

‎README.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,23 @@ To run the site locally, enter the following commands into a terminal window:
3131
git clone https://github.com/swiftlang/swift-org-website.git
3232
cd swift-org-website
3333
bundle install
34-
LC_ALL=en_us.UTF-8 bundle exec jekyll serve
34+
LC_ALL=en_us.UTF-8 bundle exec jekyll serve --config _config.yml,_config_dev.yml
3535
open "http://localhost:4000"
3636
```
3737

38+
If you’d like to contribute to this project, please run Prettier before submitting your pull request to ensure consistent code style across the project.
39+
40+
Requirements
41+
- [Node v18.17.1 or higher](https://nodejs.org)
42+
43+
```shell
44+
npm install
45+
```
46+
47+
```shell
48+
npm run prettify
49+
```
50+
3851
### Running in Docker
3952

4053
First build the site with Docker Compose:

‎_config.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ url: https://swift.org
22
title: Swift.org
33
description: "Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns."
44
timezone: America/Lower_Princes
5-
exclude: ["README.md", "config.ru", "Gemfile", "Gemfile.lock", "Procfile", "vendor"]
5+
exclude: ["README.md", "config.ru", "Gemfile", "Gemfile.lock", "Procfile", "vendor", "get-started/storybook"]
66
safe: false
77
future: true
88

@@ -29,3 +29,4 @@ whitelist:
2929

3030
include:
3131
- .well-known
32+
- assets/fonts

‎_config_dev.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
exclude: []

‎_data/new-data/footer/community-navigation.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
- title: Overview
2+
link: /community/
3+
- title: Swift Evolution
4+
link: /swift-evolution/
5+
- title: Diversity
6+
link: /diversity/
7+
- title: Mentorship
8+
link: /mentorship/
9+
- title: Contributing
10+
link: /contributing/

0 commit comments

Comments
 (0)