begin implementing Klavika and Open Sans

This commit is contained in:
Jason Costello 2017-02-23 11:02:48 -08:00
parent fbe9e22a87
commit 9fde39c2e7
7 changed files with 28 additions and 26 deletions

View File

@ -136,7 +136,6 @@ body.layout-intro {
> a { > a {
text-transform: uppercase; text-transform: uppercase;
font-family: $font-family-museo-sans;
font-weight: $font-weight-museo-sans-sb; font-weight: $font-weight-museo-sans-sb;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
@ -151,7 +150,6 @@ body.layout-intro {
> a { > a {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
font-family: $font-family-museo-sans;
padding: 6px 15px; padding: 6px 15px;
} }
@ -165,7 +163,6 @@ body.layout-intro {
> a { > a {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
font-family: $font-family-museo-sans;
} }
} }
} }
@ -190,7 +187,7 @@ body.layout-intro {
p, li, .alert { p, li, .alert {
font-size: 20px; font-size: 20px;
font-family: $font-family-museo-sans; font-family: $font-family-open-sans;
font-weight: $font-weight-museo-sans; font-weight: $font-weight-museo-sans;
line-height: 1.5em; line-height: 1.5em;
margin: 0 0 18px; margin: 0 0 18px;
@ -206,6 +203,7 @@ body.layout-intro {
} }
a { a {
font-family: $font-family-open-sans;
color: $vagrant-blue; color: $vagrant-blue;
&:hover{ &:hover{

View File

@ -13,17 +13,19 @@ body {
font-weight: 300; font-weight: 300;
} }
h1, h2, h3, h4, h5 {
font-family: $font-family-klavika;
}
h1 { h1 {
font-size: 42px; font-size: 42px;
line-height: 42px; line-height: 42px;
font-family: $font-family-museo-sans;
font-weight: $font-weight-museo-sans-sb; font-weight: $font-weight-museo-sans-sb;
margin-bottom: 24px; margin-bottom: 24px;
} }
h2 { h2 {
text-transform: uppercase; text-transform: uppercase;
font-family: $font-family-museo-sans;
font-weight: $font-weight-museo-sans-sb; font-weight: $font-weight-museo-sans-sb;
margin-top: 70px; margin-top: 70px;
} }
@ -35,10 +37,13 @@ h1 + h2 {
h3 { h3 {
font-size: 28px; font-size: 28px;
line-height: 28px; line-height: 28px;
font-family: $font-family-museo-sans;
font-weight: $font-weight-museo-sans-sb; font-weight: $font-weight-museo-sans-sb;
} }
p, a {
font-family: $font-family-open-sans;
}
.highlight{ .highlight{
margin-bottom: 18px; margin-bottom: 18px;
} }
@ -48,7 +53,7 @@ pre {
color: $white; color: $white;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
font-family: $font-family-monospace; font-family: $font-family-mono;
border: none; border: none;
padding: 20px; padding: 20px;
margin-bottom: 0; margin-bottom: 0;

View File

@ -17,7 +17,6 @@
text-shadow: 0 1px 10px rgba(255, 255, 255, 0.4); text-shadow: 0 1px 10px rgba(255, 255, 255, 0.4);
h1 { h1 {
@include museo-sans-light;
color: $purple-text; color: $purple-text;
font-size: 55px; font-size: 55px;
font-weight: 700; font-weight: 700;
@ -26,7 +25,6 @@
} }
h2 { h2 {
@include museo-sans-light;
color: $blue-text; color: $blue-text;
font-size: 28px; font-size: 28px;
font-weight: 100; font-weight: 100;
@ -68,13 +66,11 @@
font-size: 40px; font-size: 40px;
margin-bottom: $baseline; margin-bottom: $baseline;
color: $purple-text; color: $purple-text;
@include museo-sans-light;
} }
h4 { h4 {
font-size: 20px; font-size: 20px;
line-height: $baseline * 1.5; line-height: $baseline * 1.5;
@include museo-sans-light;
} }
} }
} }
@ -102,7 +98,6 @@
h1 { h1 {
color: $dark-gray-text; color: $dark-gray-text;
@include museo-sans-light;
} }
.customer-logos { .customer-logos {

View File

@ -38,11 +38,11 @@ $primary-button-color: #48b4fb;
// Typography // Typography
// ------------------------- // -------------------------
$font-family-museo-sans: "Museo Sans", "Helvetica Neue", helvetica, arial, sans-serif; $font-family-open-sans: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
$font-weight-museo-sans-xl: 100; $font-family-klavika: "klavika-web", "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
$font-weight-museo-sans-reg: 300; $font-family-mono: "Courier New", Monaco, Menlo, Consolas, monospace;
$font-weight-museo-sans-sb: 500; $font-weight-museo-sans-xl: 100;
$font-weight-museo-sans-xb: 700; $font-weight-museo-sans-reg: 300;
$font-weight-museo-sans-sb: 500;
$font-weight-museo-sans-xb: 700;
$font-weight-museo-sans: $font-weight-museo-sans-reg; $font-weight-museo-sans: $font-weight-museo-sans-reg;
$font-family-monospace: "Courier New", monospace;

View File

@ -3,6 +3,7 @@
@import "bootstrap"; @import "bootstrap";
// Remote fonts // Remote fonts
@import url("//fonts.googleapis.com/css?family=Open+Sans:300,400,600");
@import url("//fonts.googleapis.com/css?family=Inconsolata:400,700"); @import url("//fonts.googleapis.com/css?family=Inconsolata:400,700");
// Core variables and mixins // Core variables and mixins

View File

@ -7,8 +7,7 @@
// -------------------------------------------------- // --------------------------------------------------
// Variables // Variables
$font-family-museo-sans: 'museo-sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; $header-font-family: $font-family-open-sans;
$header-font-family: $font-family-museo-sans;
$header-font-weight: 600; // semi-bold $header-font-weight: 600; // semi-bold
$header-height: 74px; $header-height: 74px;
@ -63,22 +62,22 @@ $nav-margin-right: 12px;
} }
@mixin open-light() { @mixin open-light() {
font-family: $font-family-museo-sans; font-family: $font-family-open-sans;
font-weight: 300; font-weight: 300;
} }
@mixin open() { @mixin open() {
font-family: $font-family-museo-sans; font-family: $font-family-open-sans;
font-weight: 400; font-weight: 400;
} }
@mixin open-sb() { @mixin open-sb() {
font-family: $font-family-museo-sans; font-family: $font-family-open-sans;
font-weight: 600; font-weight: 600;
} }
@mixin open-bold() { @mixin open-bold() {
font-family: $font-family-museo-sans; font-family: $font-family-open-sans;
font-weight: 700; font-weight: 700;
} }

View File

@ -29,6 +29,10 @@
})(window,document,'script','dataLayer','GTM-NR2SD7C');</script> })(window,document,'script','dataLayer','GTM-NR2SD7C');</script>
<!-- End Google Tag Manager --> <!-- End Google Tag Manager -->
<!-- Typekit script to import Klavika font -->
<script src="https://use.typekit.net/wxf7mfi.js"></script>
<script>try{Typekit.load({ async: true });}catch(e){}</script>
<%= yield_content :head %> <%= yield_content :head %>
</head> </head>