Skip to content

Commit e4896ae

Browse files
AlexEneAlexEne
authored
Merge pull request #1 from 17cupsofcoffee/prettify
First pass at the design of the website
2 parents e0cd7f5 + ac53e4d commit e4896ae

14 files changed

+114
-47
lines changed

‎README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33

44
## License
55

6-
This project is licensed under either of
6+
This project is licensed under either of:
77

88
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
99
http://www.apache.org/licenses/LICENSE-2.0)
1010
* MIT license ([LICENSE-MIT](LICENSE-MIT) or
1111
http://opensource.org/licenses/MIT)
12+
13+
With the exception of the [Font Awesome](https://fontawesome.com) social icons, which are used under a [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/) license.

‎_config.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
title: Rust Game Development Working Group
22
#author: GitHub User
33
#email: your-email@domain.com
4-
#description: > # this means to ignore newlines until "show_excerpts:"
5-
# Stay up to date with the progress and recent developments in the Rust Game Development Working Group.
4+
description: Stay up to date with the progress and recent developments in the Rust Game Development Working Group.
65
url: "https://rust-gamedev.github.io"
76
show_excerpts: false # set to true to show excerpts on the homepage
87

@@ -12,10 +11,11 @@ minima:
1211
date_format: "%b %-d, %Y"
1312

1413
# generate social links in footer
15-
# social_links:
14+
social_links:
1615
# twitter: jekyllrb
17-
# github: jekyll
18-
# rss: rss
16+
github: rust-gamedev
17+
discord: j6QJsMd
18+
rss: RSS
1919
# dribbble: jekyll
2020
# facebook: jekyll
2121
# flickr: jekyll

‎_includes/footer.html

+14-15
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@
55

66
<div class="footer-col-wrapper">
77
<div class="footer-col one-half">
8-
<h2 class="footer-heading">{{ site.title | escape }}</h2>
9-
<ul class="contact-list">
10-
<li class="p-name">
11-
{%- if site.author -%}
12-
{{ site.author | escape }}
13-
{%- endif -%}
14-
</li>
15-
{%- if site.email -%}
16-
<li><a class="u-email" href="mailto:{{ site.email }}">{{ site.email }}</a></li>
17-
{%- endif -%}
18-
</ul>
19-
</div>
20-
21-
<div class="footer-col one-half">
8+
<h2 class="footer-heading">{{ site.title | escape }}</h2>
9+
{%- if site.author || site.email -%}
10+
<ul class="contact-list">
11+
<li class="p-name">
12+
{%- if site.author -%}
13+
{{ site.author | escape }}
14+
{%- endif -%}
15+
</li>
16+
{%- if site.email -%}
17+
<li><a class="u-email" href="mailto:{{ site.email }}">{{ site.email }}</a></li>
18+
{%- endif -%}
19+
</ul>
20+
{%- endif -%}
2221
<p>{{- site.description | escape -}}</p>
2322
</div>
2423

25-
<div class="social-links">
24+
<div class="footer-col one-half">
2625
{%- include social.html -%}
2726
</div>
2827
</div>

‎_includes/header.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
{%- assign default_paths = site.pages | map: "path" -%}
55
{%- assign page_paths = site.header_pages | default: default_paths -%}
66
{%- assign titles_size = site.pages | map: 'title' | join: '' | size -%}
7-
<a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
7+
<a class="site-title" rel="author" href="{{ "/" | relative_url }}">
8+
<img src="{{ '/assets/logo_small.png' | relative_url }}" width="48" height="48" alt="" />
9+
{{ site.title | escape }}
10+
</a>
811

912
{%- if titles_size > 0 -%}
1013
<nav class="site-nav">

‎_includes/social.html

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{%- assign social = site.minima.social_links -%}
22

3-
<ul class="social-media-list">
3+
<ul class="social-links">
44
{%- if social.dribbble -%}<li><a href="https://dribbble.com/{{ social.dribbble | cgi_escape | escape }}" title="{{ social.dribbble | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#dribbble' | relative_url }}"></use></svg></a></li>{%- endif -%}
55
{%- if social.facebook -%}<li><a href="https://www.facebook.com/{{ social.facebook | cgi_escape | escape }}" title="{{ social.facebook | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#facebook' | relative_url }}"></use></svg></a></li>{%- endif -%}
66
{%- if social.flickr -%}<li><a href="https://www.flickr.com/photos/{{ social.flickr | cgi_escape | escape }}" title="{{ social.flickr | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#flickr' | relative_url }}"></use></svg></a></li>{%- endif -%}
7-
{%- if social.github -%}<li><a href="https://github.com/{{ social.github | cgi_escape | escape }}" title="{{ social.github | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#github' | relative_url }}"></use></svg></a></li>{%- endif -%}
7+
{%- if social.github -%}<li><a href="https://github.com/{{ social.github | cgi_escape | escape }}" title="{{ social.github | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#github' | relative_url }}"></use></svg> Github (rust-gamedev)</a></li>{%- endif -%}
88
{%- if social.instagram -%}<li><a href="https://www.instagram.com/{{ social.instagram | cgi_escape | escape }}" title="{{ social.instagram | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#instagram' | relative_url }}"></use></svg></a></li>{%- endif -%}
99
{%- if social.linkedin -%}<li><a href="https://www.linkedin.com/in/{{ social.linkedin | cgi_escape | escape }}" title="{{ social.linkedin | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#linkedin' | relative_url }}"></use></svg></a></li>{%- endif -%}
1010
{%- if social.pinterest -%}<li><a href="https://www.pinterest.com/{{ social.pinterest | cgi_escape | escape }}" title="{{ social.pinterest | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#pinterest' | relative_url }}"></use></svg></a></li>{%- endif -%}
@@ -14,5 +14,6 @@
1414
{%- if social.youtube_channel -%}<li><a href="https://www.youtube.com/channel/{{ social.youtube_channel | cgi_escape | escape }}" title="{{ social.youtube_channel_name | escape | default: 'YouTube' }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#youtube' | relative_url }}"></use></svg></a></li>{%- endif -%}
1515
{%- if social.telegram -%}<li><a href="https://t.me/{{ social.telegram | cgi_escape | escape }}" title="{{ social.telegram | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#telegram' | relative_url }}"></use></svg></a></li>{%- endif -%}
1616
{%- if social.microdotblog -%}<li><a rel="me" href="https://micro.blog/{{ social.microdotblog | cgi_escape | escape }}" title="{{ social.microdotblog | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#microdotblog' | relative_url }}"></use></svg></a></li>{%- endif -%}
17-
{%- if social.rss -%}<li><a href="{{ 'feed.xml' | relative_url }}" title="{{ social.rss | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#rss' | relative_url }}"></use></svg></a></li>{%- endif -%}
17+
{%- if social.discord -%}<li><a href="https://discord.gg/{{ social.discord | cgi_escape | escape }}" title="Discord"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#discord' | relative_url }}"></use></svg> Discord (#wg-gamedev)</a></li>{%- endif -%}
18+
{%- if social.rss -%}<li><a href="{{ 'feed.xml' | relative_url }}" title="{{ social.rss | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#rss' | relative_url }}"></use></svg> RSS feed</a></li>{%- endif -%}
1819
</ul>

‎_layouts/default.html

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
{%- include header.html -%}
99

1010
<main class="page-content" aria-label="Content">
11-
<div class="wrapper">
12-
{{ content }}
13-
</div>
11+
{{ content }}
1412
</main>
1513

1614
{%- include footer.html -%}

‎_layouts/home.html

+30-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
---
22
layout: default
33
---
4+
{%- assign social = site.minima.social_links -%}
45

5-
<div class="home">
6-
{%- if page.title -%}
7-
<h1 class="page-heading">{{ page.title }}</h1>
8-
{%- endif -%}
6+
<section class="intro">
7+
<div class="wrapper">
8+
<p class="intro-icons" aria-hidden="true">
9+
🦀 💖 🕹️
10+
</p>
11+
<p class="intro-lead">
12+
Making Rust a first-class choice for game development
13+
</p>
14+
<p>
15+
The Rust game development working group's goals are to improve the experience of using Rust to make games, and to make it accessible even if you're not an experienced engine/graphics developer.
16+
</p>
17+
<p>
18+
Join us on
19+
<a href="https://github.com/{{ social.github | cgi_escape | escape }}/wg"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#github' | relative_url }}"></use></svg> Github</a>
20+
or
21+
<a href="https://discord.gg/{{ social.discord | cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#discord' | relative_url }}"></use></svg> Discord</a>,
22+
and help shape the future of game development in Rust!
23+
</p>
24+
</div>
25+
</section>
926

10-
{{ content }}
27+
<div class="home wrapper">
28+
<h2 class="post-list-heading">{{ page.list_title | default: "Latest News" }}</h2>
1129

1230
{%- if site.posts.size > 0 -%}
13-
<h2 class="post-list-heading">{{ page.list_title | default: "Posts" }}</h2>
1431
<ul class="post-list">
1532
{%- for post in site.posts -%}
1633
<li>
@@ -27,12 +44,12 @@ <h3>
2744
</li>
2845
{%- endfor -%}
2946
</ul>
30-
31-
<p class="feed-subscribe">
32-
<a href="{{ 'feed.xml' | relative_url }}">
33-
<svg class="svg-icon orange"><use xlink:href="{{ 'assets/minima-social-icons.svg#rss' | relative_url }}"></use></svg><span>Subscribe</span>
34-
</a>
35-
</p>
47+
{%- else -%}
48+
<p class="grey">None yet - stay tuned for updates and announcements!</p>
3649
{%- endif -%}
37-
50+
<p class="feed-subscribe">
51+
<a href="{{ 'feed.xml' | relative_url }}">
52+
<svg class="svg-icon orange"><use xlink:href="{{ 'assets/minima-social-icons.svg#rss' | relative_url }}"></use></svg><span>Subscribe</span>
53+
</a>
54+
</p>
3855
</div>

‎_layouts/page.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: default
33
---
4-
<article class="post">
4+
<article class="post wrapper">
55

66
<header class="post-header">
77
<h1 class="post-title">{{ page.title | escape }}</h1>

‎_layouts/post.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: default
33
---
4-
<article class="post h-entry" itemscope itemtype="http://schema.org/BlogPosting">
4+
<article class="post h-entry wrapper" itemscope itemtype="http://schema.org/BlogPosting">
55

66
<header class="post-header">
77
<h1 class="post-title p-name" itemprop="name headline">{{ page.title | escape }}</h1>

‎_sass/extra.scss

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
.intro {
2+
color: #ffffff;
3+
background-color: #0074D9;
4+
margin-top: -30px;
5+
padding: 32px 0;
6+
border-bottom: 1px solid #e8e8e8;
7+
text-align: center;
8+
9+
.intro-icons {
10+
font-size: 2em;
11+
}
12+
13+
.intro-lead {
14+
font-weight: bold;
15+
font-size: 1.5em;
16+
}
17+
18+
a {
19+
color: white;
20+
font-weight: bold;
21+
}
22+
}
23+
24+
.home {
25+
margin-top: 32px;
26+
}
27+
28+
.social-links {
29+
list-style: none;
30+
margin: 0;
31+
32+
li {
33+
margin-bottom: 4px;
34+
35+
a {
36+
color: $grey-color;
37+
}
38+
}
39+
}

‎assets/css/style.scss

+6
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,10 @@
22
# Only the main Sass file needs front matter (the dashes are enough)
33
---
44

5+
// Some of the default colors do not meet the WCAG 2.0 accessibility
6+
// guidelines for contrast.
7+
$grey-color: #595959;
8+
$brand-color: #1757AA;
9+
510
@import "minima";
11+
@import "extra";

‎assets/logo_small.png

3.44 KB
Loading

‎assets/minima-social-icons.svg

+6-2
Loading

‎index.md

-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@
77
#
88
layout: home
99
---
10-
11-
Stay up to date with the news and progress related to the Rust Game Development Working Group.

0 commit comments

Comments
 (0)