Skip to content

Commit 49342b3

Browse files
skadeskade
authored
Merge branch 'master' into master
2 parents 50be576 + d2af8e2 commit 49342b3

File tree

4 files changed

+70
-44
lines changed

4 files changed

+70
-44
lines changed

‎src/styles/app.scss

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ html {
2323
body {
2424
font-family: $body-font;
2525
background-color: white;
26+
font-size: 1.5rem;
27+
line-height: 1.6;
2628

2729
/* Ensure the footer is always at the bottom of the screen */
2830
min-height: 100vh;
@@ -94,6 +96,10 @@ button {
9496
font-size: 0.8em;
9597
}
9698

99+
.button.button-secondary--no-skeleton {
100+
margin-bottom: 0;
101+
}
102+
97103
code.code-header {
98104
background-color: rgba(127, 127, 127, 0.25);
99105
font-size: 2rem;
@@ -105,6 +111,8 @@ header h1, section h2 {
105111
font-family: $header-font;
106112
z-index: 999999;
107113
position: relative;
114+
letter-spacing: 1px;
115+
font-weight: 300;
108116
}
109117

110118
header h1 {
@@ -164,6 +172,8 @@ section {
164172
margin: 0;
165173
padding: 0;
166174
letter-spacing: 1px;
175+
font-size: 4.2rem;
176+
line-height: 1.25;
167177
}
168178
}
169179

@@ -357,6 +367,7 @@ header h1 {
357367
left: -10px;
358368
width: 120%;
359369
max-width: 90vw;
370+
line-height: 1.6;
360371
}
361372

362373
footer {
@@ -371,6 +382,11 @@ footer {
371382
ul {
372383
list-style-type: none;
373384
padding-left: 0;
385+
margin-top: 0;
386+
}
387+
388+
li {
389+
margin-bottom: 1rem;
374390
}
375391

376392
a {
@@ -387,6 +403,8 @@ footer {
387403
footer h4 {
388404
font-size: 1.2em;
389405
font-weight: 800;
406+
margin-top: 0;
407+
margin-bottom: 2rem;
390408
}
391409

392410
footer img {
@@ -600,6 +618,10 @@ blockquote::before {
600618
width: 1px;
601619
}
602620

621+
.flex-grow {
622+
flex-grow: 1;
623+
}
624+
603625
.flex {
604626
&.vertical {
605627
flex-direction: column;
@@ -637,10 +659,6 @@ blockquote::before {
637659
font-size: 4rem;
638660
}
639661

640-
h2 {
641-
font-size: 3rem;
642-
}
643-
644662
.highlight {
645663
height: 20px;
646664
top: -20px;
@@ -663,6 +681,10 @@ blockquote::before {
663681
top: 10px;
664682
bottom: 30px;
665683
}
684+
685+
h2 {
686+
font-size: 3rem;
687+
}
666688
}
667689
}
668690

‎templates/community/index.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@
115115
class="button button-secondary">View Calendar</a>
116116
</li>
117117
<li>
118-
<a href="https://blog.rust-lang.org/2018/01/31/The-2018-Rust-Event-Lineup.html"
119-
class="button button-secondary">Check out the 2018 Conference Lineup</a>
118+
<a href="https://blog.rust-lang.org/2019/05/20/The-2019-Rust-Event-Lineup.html"
119+
class="button button-secondary">Check out the 2019 Conference Lineup</a>
120120
</li>
121121
</ul>
122122
</div>

‎templates/components/footer.hbs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<footer>
22
<div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
3-
<div class="row">
4-
<div class="four columns mt3 mt0-l" id="get-help">
3+
<div class="flex flex-column flex-row-ns pv0-l">
4+
<div class="flex flex-column mw8 w-100 measure-wide-l pv2 pv5-m pv2-ns ph4-m ph4-l" id="get-help">
55
<h4>Get help!</h4>
66
<ul>
77
<li><a href="https://doc.rust-lang.org">Documentation</a></li>
@@ -15,7 +15,7 @@
1515
</select>
1616
</div>
1717
</div>
18-
<div class="four columns mt3 mt0-l">
18+
<div class="flex flex-column mw8 w-100 measure-wide-l pv2 pv5-m pv2-ns ph4-m ph4-l">
1919
<h4>Terms and policies</h4>
2020
<ul>
2121
<li><a href="/policies/code-of-conduct">Code of Conduct</a></li>
@@ -25,12 +25,14 @@
2525
<li><a href="/policies">All Policies</a></li>
2626
</ul>
2727
</div>
28-
<div class="four columns mt3 mt0-l">
28+
<div class="flex flex-column mw8 w-100 measure-wide-l pv2 pv5-m pv2-ns ph4-m ph4-l">
2929
<h4>Social</h4>
30-
<a href="https://twitter.com/rustlang"><img src="/static/images/twitter.svg" alt="twitter logo" title="Twitter"/></a>
31-
<a href="https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA"><img style="padding-top: 6px; padding-bottom:6px" src="/static/images/youtube.svg" alt="youtube logo" title="YouTube"/></a>
32-
<a href="https://discord.gg/rust-lang"><img src="/static/images/discord.svg" alt="discord logo" title="Discord"/></a>
33-
<a href="https://github.com/rust-lang"><img src="/static/images/github.svg" alt="github logo" title="GitHub"/></a>
30+
<div class="flex flex-row flex-wrap">
31+
<a href="https://twitter.com/rustlang"><img src="/static/images/twitter.svg" alt="twitter logo" title="Twitter"/></a>
32+
<a href="https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA"><img style="padding-top: 6px; padding-bottom:6px" src="/static/images/youtube.svg" alt="youtube logo" title="YouTube"/></a>
33+
<a href="https://discord.gg/rust-lang"><img src="/static/images/discord.svg" alt="discord logo" title="Discord"/></a>
34+
<a href="https://github.com/rust-lang"><img src="/static/images/github.svg" alt="github logo" title="GitHub"/></a>
35+
</div>
3436
</div>
3537

3638
</div>

‎templates/learn/index.hbs

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<section class="flex flex-column flex-row-l pv0-l">
1616
<div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb6-ns ph4-l">
1717
<div class="v-top pl4 pl0-l pt3-l measure-wide-l flex-l flex-column-l flex-auto-l">
18-
<p>Affectionately nicknamed “the book,” <cite>The Rust Programming
18+
<p class="flex-grow">Affectionately nicknamed “the book,” <cite>The Rust Programming
1919
Language</cite> will give you an overview of the language from first
2020
principles. You’ll build a few projects along the way, and by the end,
2121
you’ll have a solid grasp of the language.</p>
@@ -24,15 +24,15 @@
2424
</div>
2525
<div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb6-ns ph4-l">
2626
<div class="v-top pl4 pl0-l pt3-l measure-wide-l flex-l flex-column-l flex-auto-l">
27-
<p>Alternatively, Rustlings guides you through downloading and setting up the
27+
<p class="flex-grow">Alternatively, Rustlings guides you through downloading and setting up the
2828
Rust toolchain, and teaches you the basics of reading and writing
2929
Rust syntax, on the command line. It's an alternative to Rust by Example that works with your own environment.</p>
3030
<a class="button button-secondary" href="https://github.com/rust-lang/rustlings/">Do the Rustlings course!</a>
3131
</div>
3232
</div>
3333
<div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb6-ns ph4-l">
3434
<div class="v-top pl4 pl0-l pt3-l measure-wide-l flex-l flex-column-l flex-auto-l">
35-
<p>If reading multiple hundreds of pages about a language isn’t your
35+
<p class="flex-grow">If reading multiple hundreds of pages about a language isn’t your
3636
style, then Rust By Example has you covered. While the book talks
3737
about code with a lot of words, RBE shows off a bunch of code, and
3838
keeps the talking to a minimum. It also includes exercises!</p>
@@ -57,51 +57,53 @@
5757
<code>rustup doc</code> command, which will open up these resources for
5858
you in your browser without requiring a network connection!</p>
5959

60+
{{!-- TODO: Remove button-secondary--no-skeleton once Skeleton is completely removed. --}}
61+
6062
<section class="flex flex-column">
61-
<div class="pt3 flex flex-column flex-row-l">
63+
<div class="pt3 flex flex-column flex-row-l items-center-l mb4-l">
6264
<a href="https://doc.rust-lang.org/std/index.html"
63-
class="button button-secondary mw6-l w-100">The standard library</a>
64-
<p class="pl4-l">
65+
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">The standard library</a>
66+
<p class="pl4-l ma0-l mt1 mb3">
6567
Comprehensive guide to the Rust standard library APIs.
6668
</p>
6769
</div>
6870

69-
<div class="pt4 pt3-l flex flex-column flex-row-l">
71+
<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
7072
<a href="https://doc.rust-lang.org/edition-guide/index.html"
71-
class="button button-secondary mw6-l w-100">Edition Guide</a>
72-
<p class="pl4-l">
73+
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">Edition Guide</a>
74+
<p class="pl4-l ma0-l mt1 mb3">
7375
Guide to the Rust editions.
7476
</p>
7577
</div>
7678

77-
<div class="pt4 pt3-l flex flex-column flex-row-l">
79+
<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
7880
<a href="https://doc.rust-lang.org/cargo/index.html"
79-
class="button button-secondary mw6-l w-100">Cargo Book</a>
80-
<p class="pl4-l">
81+
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">Cargo Book</a>
82+
<p class="pl4-l ma0-l mt1 mb3">
8183
A book on Rust’s package manager and build system.
8284
</p>
8385
</div>
8486

85-
<div class="pt4 pt3-l flex flex-column flex-row-l">
87+
<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
8688
<a href="https://doc.rust-lang.org/rustdoc/index.html"
87-
class="button button-secondary mw6-l w-100">rustdoc Book</a>
88-
<p class="pl4-l">
89+
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">rustdoc Book</a>
90+
<p class="pl4-l ma0-l mt1 mb3">
8991
Learn how to make awesome documentation for your crate.
9092
</p>
9193
</div>
9294

93-
<div class="pt4 pt3-l flex flex-column flex-row-l">
95+
<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
9496
<a href="https://doc.rust-lang.org/rustc/index.html"
95-
class="button button-secondary mw6-l w-100">rustc Book</a>
96-
<p class="pl4-l">
97+
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">rustc Book</a>
98+
<p class="pl4-l ma0-l mt1 mb3">
9799
Familiarize yourself with the knobs available in the Rust compiler.
98100
</p>
99101
</div>
100102

101-
<div class="pt4 pt3-l flex flex-column flex-row-l">
103+
<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
102104
<a href="https://doc.rust-lang.org/error-index.html"
103-
class="button button-secondary mw6-l w-100">Compiler Error Index</a>
104-
<p class="pl4-l">
105+
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">Compiler Error Index</a>
106+
<p class="pl4-l mb0 mt1 ma0-l">
105107
In-depth explanations of the errors you may see from the Rust
106108
compiler.
107109
</p>
@@ -112,32 +114,32 @@
112114
<div class="row black">
113115
<h3>Build your skills in an application domain</h3>
114116
<section class="flex flex-column">
115-
<div class="pt3 flex flex-column flex-row-l">
117+
<div class="pt3 flex flex-column flex-row-l items-center-l mb4-l">
116118
<a href="https://rust-lang-nursery.github.io/cli-wg/"
117-
class="button button-secondary mw6-l w-100">
119+
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">
118120
Command Line Book
119121
</a>
120-
<p class="pl4-l">
122+
<p class="pl4-l ma0-l mt1 mb3">
121123
Learn how to build effective command line applications in Rust.
122124
</p>
123125
</div>
124126

125-
<div class="pt4 pt3-l flex flex-column flex-row-l">
127+
<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
126128
<a href="https://rustwasm.github.io/docs/book/"
127-
class="button button-secondary mw6-l w-100">
129+
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">
128130
WebAssembly Book
129131
</a>
130-
<p class="pl4-l">
132+
<p class="pl4-l ma0-l mt1 mb3">
131133
Use Rust to build browser-native libraries through WebAssembly.
132134
</p>
133135
</div>
134136

135-
<div class="pt4 pt3-l flex flex-column flex-row-l">
137+
<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
136138
<a href="https://rust-embedded.github.io/book/"
137-
class="button button-secondary mw6-l w-100">
139+
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">
138140
Embedded Book
139141
</a>
140-
<p class="pl4-l">
142+
<p class="pl4-l mb0 mt1 ma0-l">
141143
Become proficient with Rust for Microcontrollers and other
142144
embedded systems.
143145
</p>

0 commit comments

Comments
 (0)