Merge pull request #221 from revelrylabs/216-update-font-family

216 update font family
revelrylabs · May 1, 2018 · 800c48c · 800c48c
2 parents bf22d2f + 1afef38
commit 800c48c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/docs-src/src/layouts/index.scss b/docs-src/src/layouts/index.scss
@@ -1,4 +1,5 @@
 @import '../../../scss/app';
+@import url('https://use.typekit.net/qqm8vsn.css');
 
 @mixin alert-color-stack {
   background-color: $alert;
@@ -7,7 +8,18 @@
 }
 
 // TYPOGRAPHY
-h5, h6 {
+
+// Proxima Nova Headers for docs only
+h1,h2,h3,h4 {
+  font-family: 'proxima-nova', $global-sans-serif-font;
+  font-weight: 500;
+}
+h1 {
+  font-weight: 900;
+}
+
+h1 h5,
+h6 {
   font-weight: normal;
   letter-spacing: 1px;
   margin: $global-padding-large 0 0;
@@ -132,7 +144,7 @@ h5, h6 {
 }
 // Color Swatches
 .ExampleSwatches {
-  @include aspect-ratio(1,1);
+  @include aspect-ratio(1, 1);
   @include color-management;
 }
 // Buttons
@@ -210,13 +222,13 @@ h5, h6 {
   }
   .rev-Drawer-contents {
     background: $brand;
-    background: linear-gradient(to bottom, $brand-purple 0%,$brand 100%);
+    background: linear-gradient(to bottom, $brand-purple 0%, $brand 100%);
     color: $white;
     padding-bottom: $global-padding-larger;
   }
   .rev-Brand {
     color: $white;
-    padding:  0 $global-padding;
+    padding: 0 $global-padding;
     h1 {
       margin-bottom: 0;
     }

diff --git a/scss/vars/_possum-defaults.scss b/scss/vars/_possum-defaults.scss
@@ -24,17 +24,17 @@ $breakpoints: (
   xlarge-down: ((max-width: $xlarge)),
   xlarge-only: ((min-width: $xlarge) and (max-width: $xxlarge)),
   xxlarge: (min-width: $xxlarge),
-  global-width: (min-width: $global-width),
+  global-width: (min-width: $global-width)
 );
 @import '../mixins/media-queries';
 
-
 // IMPORT FONTS HERE
 
 // Global Fonts
 $global-monospace-font: 'Montserrat', sans-serif !default;
 $global-serif-font: 'Georgia', serif !default;
-$global-sans-serif-font: 'Roboto', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif !default;
+$global-sans-serif-font: 'Roboto', 'Helvetica Neue', Helvetica, Arial,
+  'Lucida Grande', sans-serif !default;
 
 // we use the global-font-sizes for typographic utilities
 // AND to determine vertical spacing
@@ -67,10 +67,10 @@ $grid-columns: 12 !default;
 // Spacing
 $global-vertical-space: $global-font-size * $global-lineheight !default; // 24px
 $global-horizontal-space: $global-vertical-space !default; // 24px
-$base-size: .8rem !default;
+$base-size: 0.8rem !default;
 
 // Global Padding
-$global-padding-tiny: $global-vertical-space / 4 !default;  // 6px
+$global-padding-tiny: $global-vertical-space / 4 !default; // 6px
 $global-padding-small: $global-vertical-space / 2 !default; // 12px
 $global-padding: $global-vertical-space !default; // 24px
 $global-padding-large: $global-vertical-space * 2 !default; // 48px
@@ -104,8 +104,8 @@ $header-font-family: $global-sans-serif-font !default;
 $header-font-style: normal !default;
 $header-font-weight: $global-weight-normal !default;
 
+// Subheader
 $subheader-color: $header-color !default;
-$header-font-family: $global-sans-serif-font !default;
 $subheader-font-weight: $global-weight-normal !default;
 
 // Paragraph Vars