From 4af66f08b1cf73e4350c7f276aba0829a1edc861 Mon Sep 17 00:00:00 2001 From: Phil Best Date: Mon, 20 May 2019 17:09:55 +0200 Subject: [PATCH 1/3] 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. --- src/main.rs | 2 +- src/styles/app.scss | 23 +++++++++++++++++++---- templates/components/footer.hbs | 18 ++++++++++-------- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/main.rs b/src/main.rs index 30a337537..d9debdfba 100644 --- a/src/main.rs +++ b/src/main.rs @@ -280,7 +280,7 @@ fn concat_vendor_css(files: Vec<&str>) { fn main() { compile_sass("app"); compile_sass("fonts"); - concat_vendor_css(vec!["skeleton", "tachyons"]); + concat_vendor_css(vec!["tachyons"]); rocket::ignite() .attach(Template::fairing()) diff --git a/src/styles/app.scss b/src/styles/app.scss index 8b4dde93d..19ceb299e 100644 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -22,6 +22,8 @@ html { body { font-family: $body-font; background-color: white; + font-size: 1.5rem; + line-height: 1.6; /* Ensure the footer is always at the bottom of the screen */ min-height: 100vh; @@ -80,12 +82,15 @@ header h1, section h2 { font-family: $header-font; z-index: 999999; position: relative; + letter-spacing: 1px; + font-weight: 300; } header h1 { font-size: 8rem; margin-bottom: 0; margin-top: 0; + line-height: 1.2 } header .button.button-download { @@ -122,6 +127,8 @@ section { margin: 0; padding: 0; letter-spacing: 1px; + font-size: 4.2rem; + line-height: 1.25; } } } @@ -314,6 +321,7 @@ header h1 { left: -10px; width: 120%; max-width: 90vw; + line-height: 1.6; } footer { @@ -328,6 +336,11 @@ footer { ul { list-style-type: none; padding-left: 0; + margin-top: 0; + } + + li { + margin-bottom: 1rem; } a { @@ -344,6 +357,8 @@ footer { footer h4 { font-size: 1.2em; font-weight: 800; + margin-top: 0; + margin-bottom: 2rem; } footer img { @@ -594,10 +609,6 @@ blockquote::before { font-size: 4rem; } - h2 { - font-size: 3rem; - } - .highlight { height: 20px; top: -20px; @@ -620,6 +631,10 @@ blockquote::before { top: 10px; bottom: 30px; } + + h2 { + font-size: 3rem; + } } } diff --git a/templates/components/footer.hbs b/templates/components/footer.hbs index d84f2367d..b48c5bd56 100644 --- a/templates/components/footer.hbs +++ b/templates/components/footer.hbs @@ -1,7 +1,7 @@