From 8eba5e0323f3bb0c2c50a0383f2af3bb3973f1f5 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Mon, 13 Feb 2017 14:41:09 -0800 Subject: [PATCH] tweak scale, simplify declarations --- website/source/assets/stylesheets/_docs.scss | 6 ++-- .../source/assets/stylesheets/_global.scss | 21 +++++++++--- website/source/assets/stylesheets/_home.scss | 33 +------------------ 3 files changed, 21 insertions(+), 39 deletions(-) diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss index 619d957f8..895d1b966 100755 --- a/website/source/assets/stylesheets/_docs.scss +++ b/website/source/assets/stylesheets/_docs.scss @@ -206,7 +206,7 @@ body.layout-intro{ } p, li, .alert { - font-size: 20px; + font-size: 18px; line-height: 1.5em; margin: 0 0 18px; -webkit-font-smoothing: antialiased; @@ -235,8 +235,8 @@ body.layout-intro{ text-transform: uppercase; word-wrap: break-word; padding-bottom: 24px; - margin-top: 40px; - margin-bottom: 24px; + margin-top: 24px; + margin-bottom: 30px; border-bottom: 1px solid #eeeeee; } diff --git a/website/source/assets/stylesheets/_global.scss b/website/source/assets/stylesheets/_global.scss index c02a22e5e..eb1cfa481 100755 --- a/website/source/assets/stylesheets/_global.scss +++ b/website/source/assets/stylesheets/_global.scss @@ -18,27 +18,40 @@ body { h1, h2, h3, h4, h5 { -webkit-font-smoothing: antialiased; font-family: "klavika-web"; + font-weight: 600; } h1{ font-size: 42px; - line-height: 42px; + line-height: 40px; margin-bottom: 24px; + text-transform: uppercase; } h2{ - font-size: 36px; + font-size: 34px; + text-transform: uppercase; } h3{ - font-size: 28px; - line-height: 28px; + font-size: 20px; + line-height: 20px; + text-transform: uppercase; } p { + margin-bottom: 30px; + font-size: 16px; + font-family: $font-family-open-sans; font-weight: regular; + line-height: 1.5; opacity: .8; } +p.lead{ + font-size: 21px; + font-weight: 400 !important; +} + //an alternative color for buttons in the doc body .btn-serf{ color: $white !important; diff --git a/website/source/assets/stylesheets/_home.scss b/website/source/assets/stylesheets/_home.scss index 14c2aacca..b2da4fddc 100755 --- a/website/source/assets/stylesheets/_home.scss +++ b/website/source/assets/stylesheets/_home.scss @@ -4,38 +4,7 @@ body.page-home { h2.tag-line { - font-size: 40px; - } - - h2{ - margin-bottom: 15px; - font-size: 42px; - line-height: 42px; - letter-spacing: 2px; - text-transform: uppercase; - font-weight: 600; - } - - h3{ - margin-bottom: 10px; - font-size: 20px; - line-height: 1.2; - letter-spacing: 1px; - text-transform: uppercase; - font-weight: 600; - } - - p{ - font-size: 16px; - line-height: 1.5; - font-weight: regular; - margin-bottom: 2.2em; - font-family: $font-family-open-sans; - } - - p.lead{ - font-size: 21px; - font-weight: 400 !important; + font-size: 40px; } #primary-cta{