Skip to content

Commit

Permalink
Remove the (now unused) vollkorn font, add Fira Code for the code exa…
Browse files Browse the repository at this point in the history
…mples.
  • Loading branch information
yatil committed Apr 14, 2017
1 parent ed66267 commit a41291c
Show file tree
Hide file tree
Showing 11 changed files with 3 additions and 15 deletions.
Binary file added source/fonts/firacode-regular.woff
Binary file not shown.
Binary file added source/fonts/firacode-regular.woff2
Binary file not shown.
Binary file removed source/fonts/vollkorn-bold.woff
Binary file not shown.
Binary file removed source/fonts/vollkorn-bold.woff2
Binary file not shown.
Binary file removed source/fonts/vollkorn-bolditalic.woff
Binary file not shown.
Binary file removed source/fonts/vollkorn-bolditalic.woff2
Binary file not shown.
Binary file removed source/fonts/vollkorn-italic.woff
Binary file not shown.
Binary file removed source/fonts/vollkorn-italic.woff2
Binary file not shown.
Binary file removed source/fonts/vollkorn.woff
Binary file not shown.
Binary file removed source/fonts/vollkorn.woff2
Binary file not shown.
18 changes: 3 additions & 15 deletions source/stylesheets/wai-act.scss
Expand Up @@ -25,18 +25,11 @@ $total_width: 100%; // px|100% // px = fixed, 100% = fluid
$gutter_width: 2%; // px|% // px = fixed, % = fluid
$container_margin: 0.5%; // auto|px|% //

// Font definitions

@include font-face("Vollkorn", font-files("vollkorn.woff2", "vollkorn.woff"), false);
/*@include font-face("Vollkorn", font-files("vollkorn-italic.woff"), "vollkorn-italic.eot", normal, italic);*/
@include font-face("Vollkorn", font-files("vollkorn-bold.woff2", "vollkorn-bold.woff"), false, bold);
/*@include font-face("Vollkorn", font-files("vollkorn-bolditalic.woff"), "vollkorn-bolditalic.eot", bold, italic);*/

@include font-face("Noto Sans", font-files("notosans-regular.woff2", "notosans-regular.woff"), false);
@include font-face("Noto Sans", font-files("notosans-italic.woff2", "notosans-italic.woff"), false, normal, italic);
@include font-face("Noto Sans", font-files("notosans-bold.woff2", "notosans-bold.woff"), false, bold);
@include font-face("Noto Sans", font-files("notosans-bolditalic.woff2", "notosans-bolditalic.woff"), false, bold, italic);

@include font-face("Fira Code", font-files("firacode-regular.woff2", "firacode-regular.woff"), false);

.font-primary, .font-secondary {
font-family: "Trebuchet MS", "HelveticaNeue", "Helvetica", "Arial", sans-serif;
Expand All @@ -45,16 +38,11 @@ $container_margin: 0.5%; // auto|px|% //
}
}

/*
.font-secondary {
font-family: Georgia, Times, "Times New Roman", serif;
pre, code {
.fonts-loaded &{
font-family: "Vollkorn", Georgia, Times, "Times New Roman", serif;
font-feature-settings: "lnum", "pnum";
font-family: "Fira Code", monospace;
}
}
*/


// Body

Expand Down

0 comments on commit a41291c

Please sign in to comment.