Skip to content

Commit

Permalink
Fixing antonio weights for browser consistency (#829)
Browse files Browse the repository at this point in the history
* v3.6.18...v3.6.19

* Added font weights to possibly fix safari misreading of antonio.

* Switching these back to 3.6.18.

* Added fallback fonts

* Added fallback fonts to the rest of the caps variables.

* Trying to trigger a build.

* Added v11 in font name to see if this helps with old cached fonts.

* Update src/assets/scss/_local-fonts.scss

Co-authored-by: Sean Adams-Hiett <[email protected]>

* Update src/assets/scss/_local-fonts.scss

Co-authored-by: Sean Adams-Hiett <[email protected]>

* Update src/assets/scss/_local-fonts.scss

Co-authored-by: Sean Adams-Hiett <[email protected]>

* Update src/assets/scss/_local-fonts.scss

Co-authored-by: Sean Adams-Hiett <[email protected]>

Co-authored-by: Sean Adams-Hiett <[email protected]>
  • Loading branch information
bspeare and pyrello authored Jan 5, 2023
1 parent a46d3c1 commit 581a215
Show file tree
Hide file tree
Showing 16 changed files with 28 additions and 14 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}.

Binary file removed src/assets/fonts/antonio-bold.woff
Binary file not shown.
Binary file removed src/assets/fonts/antonio-bold.woff2
Binary file not shown.
Binary file removed src/assets/fonts/antonio-light.woff
Binary file not shown.
Binary file removed src/assets/fonts/antonio-light.woff2
Binary file not shown.
Binary file removed src/assets/fonts/antonio-regular.woff
Binary file not shown.
Binary file removed src/assets/fonts/antonio-regular.woff2
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
32 changes: 23 additions & 9 deletions src/assets/scss/_local-fonts.scss
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down Expand Up @@ -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');
}
8 changes: 4 additions & 4 deletions src/assets/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/assets/scss/uids.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 581a215

Please sign in to comment.