diff --git a/README.md b/README.md index fed2f3d788..863dfdfeac 100755 --- a/README.md +++ b/README.md @@ -66,3 +66,4 @@ If you are starting work on a new component, please make sure that it has `statu GitHub Actions is used to build and deploy the Fractal artifact to the `gh-pages` branch. This branch is set to host UIDS using GitHub Pages. All pushes to a branches or tags will trigger a build. Branches can be accessed at http://uids.brand.uiowa.edu/branches/{your-branch-name}. + diff --git a/src/assets/fonts/antonio-bold.woff b/src/assets/fonts/antonio-bold.woff deleted file mode 100644 index 55d62bec20..0000000000 Binary files a/src/assets/fonts/antonio-bold.woff and /dev/null differ diff --git a/src/assets/fonts/antonio-bold.woff2 b/src/assets/fonts/antonio-bold.woff2 deleted file mode 100644 index de263be85e..0000000000 Binary files a/src/assets/fonts/antonio-bold.woff2 and /dev/null differ diff --git a/src/assets/fonts/antonio-light.woff b/src/assets/fonts/antonio-light.woff deleted file mode 100644 index d5ae3edd96..0000000000 Binary files a/src/assets/fonts/antonio-light.woff and /dev/null differ diff --git a/src/assets/fonts/antonio-light.woff2 b/src/assets/fonts/antonio-light.woff2 deleted file mode 100644 index 7bce626775..0000000000 Binary files a/src/assets/fonts/antonio-light.woff2 and /dev/null differ diff --git a/src/assets/fonts/antonio-regular.woff b/src/assets/fonts/antonio-regular.woff deleted file mode 100644 index 21eb741795..0000000000 Binary files a/src/assets/fonts/antonio-regular.woff and /dev/null differ diff --git a/src/assets/fonts/antonio-regular.woff2 b/src/assets/fonts/antonio-regular.woff2 deleted file mode 100644 index 9809b9d8ab..0000000000 Binary files a/src/assets/fonts/antonio-regular.woff2 and /dev/null differ diff --git a/src/assets/fonts/Antonio-Bold.woff b/src/assets/fonts/antonio-v11-bold.woff similarity index 100% rename from src/assets/fonts/Antonio-Bold.woff rename to src/assets/fonts/antonio-v11-bold.woff diff --git a/src/assets/fonts/Antonio-Bold.woff2 b/src/assets/fonts/antonio-v11-bold.woff2 similarity index 100% rename from src/assets/fonts/Antonio-Bold.woff2 rename to src/assets/fonts/antonio-v11-bold.woff2 diff --git a/src/assets/fonts/Antonio-Light.woff b/src/assets/fonts/antonio-v11-light.woff similarity index 100% rename from src/assets/fonts/Antonio-Light.woff rename to src/assets/fonts/antonio-v11-light.woff diff --git a/src/assets/fonts/Antonio-Light.woff2 b/src/assets/fonts/antonio-v11-light.woff2 similarity index 100% rename from src/assets/fonts/Antonio-Light.woff2 rename to src/assets/fonts/antonio-v11-light.woff2 diff --git a/src/assets/fonts/Antonio-Regular.woff b/src/assets/fonts/antonio-v11-regular.woff similarity index 100% rename from src/assets/fonts/Antonio-Regular.woff rename to src/assets/fonts/antonio-v11-regular.woff diff --git a/src/assets/fonts/Antonio-Regular.woff2 b/src/assets/fonts/antonio-v11-regular.woff2 similarity index 100% rename from src/assets/fonts/Antonio-Regular.woff2 rename to src/assets/fonts/antonio-v11-regular.woff2 diff --git a/src/assets/scss/_local-fonts.scss b/src/assets/scss/_local-fonts.scss index c7910ab691..15192b1c7e 100755 --- a/src/assets/scss/_local-fonts.scss +++ b/src/assets/scss/_local-fonts.scss @@ -1,26 +1,26 @@ @font-face { font-family: 'Antonio'; - src: url('../fonts/antonio-bold.woff2') format('woff2'), - url('../fonts/antonio-bold.woff') format('woff'); - font-weight: normal; + src: url('../fonts/antonio-v11-bold.woff2') format('woff2'), + url('../fonts/antonio-v11-bold.woff') format('woff'); + font-weight: 700; font-style: normal; font-display: swap; } @font-face { font-family: 'Antonio'; - src: url('../fonts/antonio-light.woff2') format('woff2'), - url('../fonts/antonio-light.woff') format('woff'); - font-weight: normal; + src: url('../fonts/antonio-v11-light.woff2') format('woff2'), + url('../fonts/antonio-v11-light.woff') format('woff'); + font-weight: 100; font-style: normal; font-display: swap; } @font-face { font-family: 'Antonio'; - src: url('../fonts/antonio-regular.woff2') format('woff2'), - url('../fonts/antonio-regular.woff') format('woff'); - font-weight: normal; + src: url('../fonts/antonio-v11-regular.woff2') format('woff2'), + url('../fonts/antonio-v11-regular.woff') format('woff'); + font-weight: 400; font-style: normal; font-display: swap; } @@ -326,3 +326,17 @@ font-style: italic; font-display: swap; } + +@font-face { + font-family: 'Antonio-fallback'; + text-transform: uppercase; + size-adjust: 99%; + src: local('Arial Narrow'); +} + +@font-face { + font-family: 'Zilla-fallback'; + size-adjust: 93%; + ascent-override: 99%; + src: local('Georgia'); +} diff --git a/src/assets/scss/_variables.scss b/src/assets/scss/_variables.scss index d538cac8ba..30944e2ef2 100755 --- a/src/assets/scss/_variables.scss +++ b/src/assets/scss/_variables.scss @@ -47,11 +47,11 @@ $border-width: 1px; // Typography $font-family-sans-serif: 'Roboto', sans-serif; -$font-family-serif: 'Zilla Slab', serif; +$font-family-serif: 'Zilla Slab', 'Zilla-fallback', serif; $font-family-serif-alt: 'Lora', serif; -$font-family-caps: 'Antonio', sans-serif; -$font-family-caps-light: 'Antonio', sans-serif; -$font-family-caps-bold: 'Antonio', sans-serif; +$font-family-caps: 'Antonio', 'Antonio-fallback', sans-serif; +$font-family-caps-light: 'Antonio', 'Antonio-fallback', sans-serif; +$font-family-caps-bold: 'Antonio', 'Antonio-fallback', sans-serif; $font-family-script: 'amnestyscript'; $font-weight-light: 300; diff --git a/src/assets/scss/uids.scss b/src/assets/scss/uids.scss index 89f6a55b49..7cebaabc1e 100644 --- a/src/assets/scss/uids.scss +++ b/src/assets/scss/uids.scss @@ -43,7 +43,6 @@ $imgpath: '../../assets/images'; 'menus/internal-navigation/internal-navigation', 'menus/main-menu/main-menu.scss', 'menus/toggle-nav/toggle-nav.scss', -'menus/quick/quick', 'menus/top/top.scss', 'menus/user-menu/user-menu', 'menus/vertical/vertical',