Skip to content

Commit

Permalink
Merge pull request #239 from UCF/hf-remove-premium-fonts
Browse files Browse the repository at this point in the history
Removed our premium fonts from the font stack
  • Loading branch information
jmbarne3 authored Feb 21, 2024
2 parents a820aab + 6893a31 commit 01f9c51
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 58 deletions.
2 changes: 1 addition & 1 deletion _docs/content/resets.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ The `<html>` and `<body>` elements are updated to provide better page-wide defau
Unlike Bootstrap 4, Athena provides an opinionated font stack and does not rely on system fonts unless no other font libraries can be loaded. Athena's base font family is its sans-serif stack:

{% highlight 'scss' %}
$font-family-sans-serif: 'Gotham SSm A', 'Gotham SSm B', 'UCF Sans Serif Alt', 'Helvetica Neue', Arial, sans-serif;
$font-family-sans-serif: 'UCF Sans Serif Alt', 'Helvetica Neue', Arial, sans-serif;
{% endhighlight %}

This `font-family` is applied to the `<body>` and automatically inherited globally throughout Athena.
Expand Down
41 changes: 2 additions & 39 deletions _docs/getting-started/download-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,7 @@ If you're upgrading from Bootstrap 3, be sure to check out the [Migration Guide]

## Webfont Configuration

Athena is built to utilize premium fonts provided by the [Cloud.typography service](http://www.typography.com/cloud/welcome/) by default, with webfont fallbacks (available in the `/dist/fonts/` directory). Using premium fonts with Athena is preferred, but not required.

### Included Fallback Fonts
### Included Fonts

If you're loading Athena from UCF's CDN, fallback fonts will be used without any additional steps.

Expand All @@ -129,43 +127,8 @@ Alternatively, you can pick a custom location for the fallback fonts directory w

### Cloud.typography Premium Font Configuration

While Athena provides fallback webfonts out-of-the-box, the preferred font families for Athena are only available via the [Cloud.typography service](http://www.typography.com/cloud/welcome/). Athena Framework users are responsible for creating their own Cloud.typography accounts and maintaining their subscriptions to the service.

#### Base Configuration

For base support with Athena, your Cloud.typography project should be configured to include the following fonts/weights:

* Gotham ScreenSmart
* Book
* Book Italic
* Bold
* Bold Italic

{% callout 'danger' %}
#### Gotham Licensing for the Web
Any existing _print_ license for Gotham usage, whether purchased via the [UCF Computer Store](https://cstore.ucf.edu/gotham/) or separately, [does not cover usage of webfonts](https://www.typography.com/faq/question.php?faqID=15).

To use Gotham on the web, _you must register for the Cloud.typography service._
As of v1.3.0, Athena is no longer supporting the use of fonts from the [Cloud.typography service](http://www.typography.com/cloud/welcome/). Instead, the project will use the "fallback" fonts contained within the project as the primary fonts.

**Do not attempt to self-host Gotham font files** that are not provided by Cloud.typography for production font projects.
{% endcallout %}

#### Font Family Extras

To take advantage of the [font family overrides available with Athena]({{ '/utilities/typography' | url }}#font-family), the following fonts/weights can also be added to your Cloud.typography project *as needed&#42;*:

* Chronicle Text Grade 3 (for `.font-serif` support)
* Roman
* Italic
* Bold
* Bold Italic
* Knockout Regular (for `.font-condensed` support)
* Knockout 49, Lightweight

Because Athena does not support older browsers, enabling Legacy Support is not necessary and is not recommended.

More weights can be added as needed per-project, however, we don't recommend usage of most "thin" or "extra light" weights due to readability concerns.

{% callout 'info' %}
<strong>*Note:</strong> Avoid adding webfonts that aren't needed for your project; as the number of fonts in a project increases, the average load time for the font project increases.
{% endcallout %}
4 changes: 2 additions & 2 deletions _docs/static/css/docs.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _docs/static/js/docs.min.js

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

4 changes: 2 additions & 2 deletions dist/css/framework.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/framework.min.js

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

2 changes: 1 addition & 1 deletion docs/content/resets/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ <h2 id="page-defaults" tabindex="-1">Page defaults <a class="header-anchor" href
<h2 id="font-stack" tabindex="-1">Font stack <a class="header-anchor" href="#font-stack"><span class="fa fa-link" aria-label="Anchor"></span></a></h2>
<p>Unlike Bootstrap 4, Athena provides an opinionated font stack and does not rely on system fonts unless no other font libraries can be loaded. Athena's base font family is its sans-serif stack:</p>
<div class="highlight"><pre><code class="language-scss">
$font-family-sans-serif: 'Gotham SSm A', 'Gotham SSm B', 'UCF Sans Serif Alt', 'Helvetica Neue', Arial, sans-serif;
$font-family-sans-serif: 'UCF Sans Serif Alt', 'Helvetica Neue', Arial, sans-serif;
</code></pre></div>
<p>This <code>font-family</code> is applied to the <code>&lt;body&gt;</code> and automatically inherited globally throughout Athena.</p>
<h2 id="headings-and-paragraphs" tabindex="-1">Headings and paragraphs <a class="header-anchor" href="#headings-and-paragraphs"><span class="fa fa-link" aria-label="Anchor"></span></a></h2>
Expand Down
7 changes: 4 additions & 3 deletions docs/getting-started/download-install/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ <h1 class="display-4 heading-underline mb-4">Download & install</h1>
<div class="col-md-8 pull-md-4 pt-3 pt-md-5 afd-content">
<p>For <a href="/Athena-Framework/getting-started/quick-start">quick usage</a>, the Athena Framework is hosted on UCF's CDN. For those that want to utilize Athena's Sass variables and mixins directly, Athena can also be downloaded from <a href="https://github.com/UCF/Athena-Framework">Github</a>, or included in your project using npm.</p>
<h2 id="contents" tabindex="-1">Contents <a class="header-anchor" href="#contents"><span class="fa fa-link" aria-label="Anchor"></span></a></h2>
<nav class="table-of-contents"><ul><li><a href="#contents">Contents </a></li><li><a href="#download-options">Download Options </a><ul><li><a href="#direct-download-zip">Direct Download (.zip) </a></li><li><a href="#cdn">CDN </a></li><li><a href="#github">Github </a></li><li><a href="#npm">npm </a></li></ul></li><li><a href="#whats-included">What&#39;s Included </a><ul><li><a href="#minified-pre-compiled-assets">Minified, pre-compiled assets </a></li><li><a href="#source-files">Source files </a></li></ul></li><li><a href="#installation">Installation </a><ul><li><a href="#installing-minified-files">Installing Minified Files </a></li><li><a href="#adding-to-existing-project-using-bootstrap">Adding to Existing Project Using Bootstrap </a></li></ul></li><li><a href="#webfont-configuration">Webfont Configuration </a><ul><li><a href="#included-fallback-fonts">Included Fallback Fonts </a></li><li><a href="#cloud-typography-premium-font-configuration">Cloud.typography Premium Font Configuration </a><ul><li><a href="#base-configuration">Base Configuration </a></li><li><a href="#font-family-extras">Font Family Extras </a></li></ul></li></ul></li></ul></nav><h2 id="download-options" tabindex="-1">Download Options <a class="header-anchor" href="#download-options"><span class="fa fa-link" aria-label="Anchor"></span></a></h2>
<nav class="table-of-contents"><ul><li><a href="#contents">Contents </a></li><li><a href="#download-options">Download Options </a><ul><li><a href="#direct-download-zip">Direct Download (.zip) </a></li><li><a href="#cdn">CDN </a></li><li><a href="#github">Github </a></li><li><a href="#npm">npm </a></li></ul></li><li><a href="#whats-included">What&#39;s Included </a><ul><li><a href="#minified-pre-compiled-assets">Minified, pre-compiled assets </a></li><li><a href="#source-files">Source files </a></li></ul></li><li><a href="#installation">Installation </a><ul><li><a href="#installing-minified-files">Installing Minified Files </a></li><li><a href="#adding-to-existing-project-using-bootstrap">Adding to Existing Project Using Bootstrap </a></li></ul></li><li><a href="#webfont-configuration">Webfont Configuration </a><ul><li><a href="#included-fonts">Included Fonts </a></li><li><a href="#cloud-typography-premium-font-configuration">Cloud.typography Premium Font Configuration </a><ul><li><a href="#base-configuration">Base Configuration </a></li><li><a href="#font-family-extras">Font Family Extras </a></li></ul></li></ul></li></ul></nav><h2 id="download-options" tabindex="-1">Download Options <a class="header-anchor" href="#download-options"><span class="fa fa-link" aria-label="Anchor"></span></a></h2>
<h3 id="direct-download-zip" tabindex="-1">Direct Download (.zip) <a class="header-anchor" href="#direct-download-zip"><span class="fa fa-link" aria-label="Anchor"></span></a></h3>
<a class="btn btn-outline-primary" href="https://github.com/UCF/Athena-Framework/archive/v1.2.0.zip">
<span class="fa fa-file-archive-o"></span> Download Athena Framework <span class="small muted">v1.2.0</span>
Expand Down Expand Up @@ -944,8 +944,7 @@ <h3 id="adding-to-existing-project-using-bootstrap" tabindex="-1">Adding to Exis
<span class="highlight-code">&lt;script type="text/javascript" src="https://cdn.ucf.edu/athena-framework/v1.2.0/js/framework.min.js"&gt;&lt;/script&gt;</span>
</code></pre>
<h2 id="webfont-configuration" tabindex="-1">Webfont Configuration <a class="header-anchor" href="#webfont-configuration"><span class="fa fa-link" aria-label="Anchor"></span></a></h2>
<p>Athena is built to utilize premium fonts provided by the <a href="http://www.typography.com/cloud/welcome/">Cloud.typography service</a> by default, with webfont fallbacks (available in the <code>/dist/fonts/</code> directory). Using premium fonts with Athena is preferred, but not required.</p>
<h3 id="included-fallback-fonts" tabindex="-1">Included Fallback Fonts <a class="header-anchor" href="#included-fallback-fonts"><span class="fa fa-link" aria-label="Anchor"></span></a></h3>
<h3 id="included-fonts" tabindex="-1">Included Fonts <a class="header-anchor" href="#included-fonts"><span class="fa fa-link" aria-label="Anchor"></span></a></h3>
<p>If you're loading Athena from UCF's CDN, fallback fonts will be used without any additional steps.</p>
<p>To utilize fallback webfonts in a manual installation, copy the <code>/fonts/</code> directory (from the <code>/dist/fonts/</code> in the framework's files) to the same folder in your project that you added the framework's CSS and JS files to. The framework's CSS is built to include webfonts from that directory.</p>
<pre><code class="nohighlight"> ├── css/
Expand All @@ -958,6 +957,8 @@ <h3 id="included-fallback-fonts" tabindex="-1">Included Fallback Fonts <a class=
<p>Alternatively, you can pick a custom location for the fallback fonts directory within your project, as long as you modify the <code>$athena-font-path</code> Sass variable and recompile.</p>
<h3 id="cloud-typography-premium-font-configuration" tabindex="-1">Cloud.typography Premium Font Configuration <a class="header-anchor" href="#cloud-typography-premium-font-configuration"><span class="fa fa-link" aria-label="Anchor"></span></a></h3>
<p>While Athena provides fallback webfonts out-of-the-box, the preferred font families for Athena are only available via the <a href="http://www.typography.com/cloud/welcome/">Cloud.typography service</a>. Athena Framework users are responsible for creating their own Cloud.typography accounts and maintaining their subscriptions to the service.</p>
<pre><code class="language-alert">As of v1.3.0, Athena is no longer supporting the use of fonts from the [Cloud.typography service](http://www.typography.com/cloud/welcome/). Instead, the project will use the &quot;fallback&quot; fonts contained within the project as the primary fonts.
</code></pre>
<h4 id="base-configuration" tabindex="-1">Base Configuration <a class="header-anchor" href="#base-configuration"><span class="fa fa-link" aria-label="Anchor"></span></a></h4>
<p>For base support with Athena, your Cloud.typography project should be configured to include the following fonts/weights:</p>
<ul>
Expand Down
4 changes: 2 additions & 2 deletions docs/static/css/docs.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/static/js/docs.min.js

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

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.

6 changes: 3 additions & 3 deletions src/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -480,10 +480,10 @@ $grid-gutter-widths: (
// Fonts
//
// Font, line-height, and color for body text, headings, and more.
$font-family-sans-serif: 'Gotham SSm A', 'Gotham SSm B', 'UCF Sans Serif Alt', 'Helvetica Neue', Arial, sans-serif !default; // modified
$font-family-serif: 'Chronicle Text G3 A', 'Chronicle Text G3 B', Georgia, 'Times New Roman', Times, serif !default; // modified
$font-family-sans-serif: 'UCF Sans Serif Alt', 'Helvetica Neue', Arial, sans-serif !default; // modified
$font-family-serif: Georgia, 'Times New Roman', Times, serif !default; // modified
$font-family-slab-serif: 'UCF Slab Serif Alt', serif !default; // custom
$font-family-condensed: 'Knockout 49 A', 'Knockout 49 B', 'UCF Condensed Alt', sans-serif !default; // custom
$font-family-condensed: 'UCF Condensed Alt', sans-serif !default; // custom
$font-family-monospace: Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace !default;
$font-family-base: $font-family-sans-serif !default;

Expand Down

0 comments on commit 01f9c51

Please sign in to comment.