Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fonts and static assets location. #574

Merged
merged 3 commits into from
Apr 24, 2019
Merged

Update fonts and static assets location. #574

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b953307
Update where we host static assets.
DFurnes Apr 24, 2019
2ff45f6
Replace Proxima Nova with Source Sans Pro.
DFurnes Apr 24, 2019
1fbc7c8
Update dependencies.
DFurnes Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 5 additions & 30 deletions scss/_base/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,11 @@
// Proxima Nova
@font-face {
font-family: "Proxima Nova";
font-weight: 400;
src: url("https://www.dosomething.org/sites/default/files/fonts/proxima-nova/ProximaNova-Regular.eot");
src: url("https://www.dosomething.org/sites/default/files/fonts/proxima-nova/ProximaNova-Regular.eot?") format("eot"),
url("https://www.dosomething.org/sites/default/files/fonts/proxima-nova/ProximaNova-Regular.woff") format("woff");
}

@font-face {
font-family: "Proxima Nova";
font-weight: 600;
src: url("https://www.dosomething.org/sites/default/files/fonts/proxima-nova/ProximaNova-SBold.eot");
src: url("https://www.dosomething.org/sites/default/files/fonts/proxima-nova/ProximaNova-SBold.eot?") format("eot"),
url("https://www.dosomething.org/sites/default/files/fonts/proxima-nova/ProximaNova-SBold.woff") format("woff");
}

@font-face {
font-family: "Proxima Nova";
font-weight: 700;
src: url("https://www.dosomething.org/sites/default/files/fonts/proxima-nova/ProximaNova-Bold.eot");
src: url("https://www.dosomething.org/sites/default/files/fonts/proxima-nova/ProximaNova-Bold.eot?") format("eot"),
url("https://www.dosomething.org/sites/default/files/fonts/proxima-nova/ProximaNova-Bold.woff") format("woff");
}

// Covered By Your Grace
@font-face {
font-family: "CoveredGrace";
src: url("https://www.dosomething.org/sites/default/files/fonts/covered-grace/CoveredGrace-Regular.eot");
src: url("https://www.dosomething.org/sites/default/files/fonts/covered-grace/CoveredGrace-Regular.eot?#iefix") format("embedded-opentype"),
url("https://www.dosomething.org/sites/default/files/fonts/covered-grace/CoveredGrace-Regular.woff") format("woff"),
url("https://www.dosomething.org/sites/default/files/fonts/covered-grace/CoveredGrace-Regular.ttf") format("truetype"),
url("https://www.dosomething.org/sites/default/files/fonts/covered-grace/CoveredGrace-Regular.svg#covered_by_your_graceregular") format("svg");
src: url("https://assets.dosomething.org/us/fonts/covered-grace/CoveredGrace-Regular.eot");
src: url("https://assets.dosomething.org/us/fonts/covered-grace/CoveredGrace-Regular.eot?#iefix") format("embedded-opentype"),
url("https://assets.dosomething.org/us/fonts/covered-grace/CoveredGrace-Regular.woff") format("woff"),
url("https://assets.dosomething.org/us/fonts/covered-grace/CoveredGrace-Regular.ttf") format("truetype"),
url("https://assets.dosomething.org/us/fonts/covered-grace/CoveredGrace-Regular.svg#covered_by_your_graceregular") format("svg");
font-weight: normal;
font-style: normal;
}
Expand Down
3 changes: 2 additions & 1 deletion scss/_utilities/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ $color-tint: 10%;
// ----------

// Font Stacks
$font-proxima-nova: "Proxima Nova", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
$font-sans-serif: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
$font-proxima-nova: $font-sans-serif; // DEPRECATED: Use $font-sans-serif.
$font-handwritten: "CoveredGrace", cursive;

$base-font-family: $font-proxima-nova;
Expand Down
14 changes: 2 additions & 12 deletions styleguide/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<link rel="stylesheet" href="node_modules/dosomething-modal/dist/modal.css" media="screen, projection" type="text/css">
<link rel="stylesheet" href="node_modules/dosomething-validation/dist/validation.css" media="screen, projection" type="text/css">

<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro" rel="stylesheet">
<link rel="stylesheet" href="dist/forge.css" media="screen, projection" type="text/css">
<link rel="stylesheet" href="dist/styleguide.css" media="screen, projection" type="text/css">

Expand Down Expand Up @@ -162,18 +163,7 @@
<%- include('pattern', { pattern: styleguide.sections('Base - Inline Elements') }) %>

<h3 id="fonts-and-colors">Fonts &amp; Colors</h3>
<p>We use <a href="http://www.marksimonson.com/fonts/view/proxima-nova">Proxima Nova</a> for all headings and body copy.</p>
<p class="font-tile" style="font-family: 'Proxima Nova'; font-weight: 400; ">
Any cause, anytime, anywhere. <code>($font-proxima-nova, $weight-normal)</code>
</p>

<p class="font-tile" style="font-family: 'Proxima Nova'; font-weight: 600; ">
Any cause, anytime, anywhere. <code>($font-proxima-nova, $weight-sbold)</code>
</p>

<p class="font-tile" style="font-family: 'Proxima Nova'; font-weight: 700; ">
Any cause, anytime, anywhere. <code>($font-proxima-nova, $weight-bold)</code>
</p>
<p>We use <a href="https://fonts.google.com/specimen/Source+Sans+Pro">Source Sans Pro</a> for all headings and body copy.</p>

<p>We use <a href="https://www.google.com/fonts/specimen/Covered+By+Your+Grace">Covered By Your Grace</a> as the "voice" of DoSomething.org.</p>
<p class="font-tile" style="font-family: 'CoveredGrace';">
Expand Down