Merge proxima nova PR

az-digital · Sep 4, 2020 · 297025e · 297025e
2 parents 9dc0c77 + d5b3468
commit 297025e
Show file tree

Hide file tree

Showing 17 changed files with 838 additions and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 # Ignore docs files
 /_site/
-/site/.jekyll-cache/
+/site/.jekyll-cache
 /site/.jekyll-metadata
 /site/docs/**/dist/
 # Hugo folders

diff --git a/dist/css/arizona-bootstrap.css b/dist/css/arizona-bootstrap.css
diff --git a/dist/css/arizona-bootstrap.css.map b/dist/css/arizona-bootstrap.css.map
diff --git a/dist/css/arizona-bootstrap.min.css b/dist/css/arizona-bootstrap.min.css
diff --git a/dist/css/arizona-bootstrap.min.css.map b/dist/css/arizona-bootstrap.min.css.map
diff --git a/scss/_custom-variables.scss b/scss/_custom-variables.scss
@@ -161,10 +161,11 @@ $enable-rounded: false;
 */
 $font-size-base: 1rem;
 // stylelint-disable value-keyword-case
-$font-family-sans-serif:      MiloWeb, Verdana, Geneva, sans-serif;
-$font-family-headings:        MiloSerifWeb, TimesNewRoman, "Times New Roman", Times, Baskerville, Georgia, serif;
-$font-family-monospace:       Menlo, Monaco, Consolas, "Courier New", monospace;
-$font-family-base:            $font-family-sans-serif;
+$font-family-sans-serif: proxima-nova, calibri, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
+$font-family-headings:   $font-family-sans-serif;
+$font-family-monospace:  SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
+$font-family-base:       $font-family-sans-serif !default;
+
 // stylelint-enable value-keyword-case
 
 $link-color: $chili;

diff --git a/scss/arizona-bootstrap.scss b/scss/arizona-bootstrap.scss
@@ -1,4 +1,3 @@
-@import "https://cdn.uadigital.arizona.edu/lib/ua-brand-fonts/1.0.0/milo.min.css";
 @import "custom-variables";
 
 // Required Bootstrap imports.

diff --git a/site/_data/nav.yml b/site/_data/nav.yml
@@ -21,6 +21,7 @@
 - title: Content
   pages:
     - title: Reboot
+    - title: Font
     - title: Typography
     - title: Code
     - title: Images

diff --git a/site/_includes/stylesheet.html b/site/_includes/stylesheet.html
@@ -1,5 +1,6 @@
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 <!-- {{ site.title }} core CSS -->
+<link href="https://use.typekit.net/tgs5qmz.css" rel="stylesheet" crossorigin="anonymous">
 {%- if jekyll.environment == "production" %}
 <link href="{{ site.baseurl }}/docs/{{ site.docs_version }}/dist/css/arizona-bootstrap.min.css" rel="stylesheet" integrity="{{ site.cdn.css_hash }}" crossorigin="anonymous">
 {% else %}

diff --git a/site/docs/0.0/assets/css/docs.min.css b/site/docs/0.0/assets/css/docs.min.css
diff --git a/site/docs/0.0/assets/css/docs.min.css.map b/site/docs/0.0/assets/css/docs.min.css.map
diff --git a/site/docs/0.0/assets/js/docs.min.js b/site/docs/0.0/assets/js/docs.min.js