Skip to content

Commit

Permalink
Remove proxima-nova font and update copyright, license and docs info …
Browse files Browse the repository at this point in the history
…at top of file
  • Loading branch information
zsmeyer committed Dec 19, 2023
1 parent 198ed8a commit 5ee9b26
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 15 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@uarizona-fnsv/bootstrap",
"version": "2.2.0",
"version": "2.2.1",
"description": "A Bootstrap theme utilizing University of Arizona branding",
"scripts": {
"build": "npm run css:all",
Expand Down
6 changes: 0 additions & 6 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,6 @@ $theme-colors: (
//
// > FONTS
//
@font-face {
// This is parsed as a normal function call that takes a quoted string.
src: url('https://use.typekit.net/emv3zbo.css');

font-family: "proxima-nova";
}

$font-size-base: 1rem;
// stylelint-disable value-keyword-case
Expand Down
9 changes: 3 additions & 6 deletions scss/fso-bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
/*!
* FSO-Bootstrap v1.1.0 (https://bootstrap.docs.fso.arizona.edu/)
* Copyright 2017-2018 FSO IT - FAST Team
* Licenced under MIT (https://gitlab.fso.arizona.edu/FAST/fso-bootstrap/blob/master/LICENSE)
* FSO-Bootstrap v2.2.1 (https://uarizona-fnsv.github.io/bootstrap/)
* Copyright 2017-2023 FSO IT - FAST Team
* Licenced under MIT (https://github.com/uarizona-fnsv/bootstrap/blob/main/LICENSE)
* A theme for Bootstrap
*/

// Additions and Tweaks

// UA Brand (now 'marcom') decided to use Proxima Nova instead of Milo
// We'll (try) loading it in fso-bootstrap.scss with the @font-face function
// or whatever it's called in css
@import "variables";

// Bootstrap (imported here so that our variables override bootstrap defaults)
Expand Down

0 comments on commit 5ee9b26

Please sign in to comment.