Skip to content

Commit 4af66f0

Browse files
committed
Removes Skeleton from the Learn page and replaces the flex implementation in the footer with Tachyon styles. Adds custom CSS code which affect the global font size, as well as letter spacing and font weight for the section and page headings sitewide.
1 parent 788babb commit 4af66f0

File tree

3 files changed

+30
-13
lines changed

3 files changed

+30
-13
lines changed

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ fn concat_vendor_css(files: Vec<&str>) {
280280
fn main() {
281281
compile_sass("app");
282282
compile_sass("fonts");
283-
concat_vendor_css(vec!["skeleton", "tachyons"]);
283+
concat_vendor_css(vec!["tachyons"]);
284284

285285
rocket::ignite()
286286
.attach(Template::fairing())

src/styles/app.scss

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

2628
/* Ensure the footer is always at the bottom of the screen */
2729
min-height: 100vh;
@@ -80,12 +82,15 @@ header h1, section h2 {
8082
font-family: $header-font;
8183
z-index: 999999;
8284
position: relative;
85+
letter-spacing: 1px;
86+
font-weight: 300;
8387
}
8488

8589
header h1 {
8690
font-size: 8rem;
8791
margin-bottom: 0;
8892
margin-top: 0;
93+
line-height: 1.2
8994
}
9095

9196
header .button.button-download {
@@ -122,6 +127,8 @@ section {
122127
margin: 0;
123128
padding: 0;
124129
letter-spacing: 1px;
130+
font-size: 4.2rem;
131+
line-height: 1.25;
125132
}
126133
}
127134
}
@@ -314,6 +321,7 @@ header h1 {
314321
left: -10px;
315322
width: 120%;
316323
max-width: 90vw;
324+
line-height: 1.6;
317325
}
318326

319327
footer {
@@ -328,6 +336,11 @@ footer {
328336
ul {
329337
list-style-type: none;
330338
padding-left: 0;
339+
margin-top: 0;
340+
}
341+
342+
li {
343+
margin-bottom: 1rem;
331344
}
332345

333346
a {
@@ -344,6 +357,8 @@ footer {
344357
footer h4 {
345358
font-size: 1.2em;
346359
font-weight: 800;
360+
margin-top: 0;
361+
margin-bottom: 2rem;
347362
}
348363

349364
footer img {
@@ -594,10 +609,6 @@ blockquote::before {
594609
font-size: 4rem;
595610
}
596611

597-
h2 {
598-
font-size: 3rem;
599-
}
600-
601612
.highlight {
602613
height: 20px;
603614
top: -20px;
@@ -620,6 +631,10 @@ blockquote::before {
620631
top: 10px;
621632
bottom: 30px;
622633
}
634+
635+
h2 {
636+
font-size: 3rem;
637+
}
623638
}
624639
}
625640

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>

0 commit comments

Comments
 (0)