Skip to content
This repository has been archived by the owner on Apr 30, 2024. It is now read-only.

Commit

Permalink
Merge pull request #423 from creativecommons/version_15
Browse files Browse the repository at this point in the history
Bump package to version 15
  • Loading branch information
dhruvkb authored May 31, 2020
2 parents 2945963 + 1ecdd62 commit 43ce54d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 10 deletions.
3 changes: 0 additions & 3 deletions .storybook/preview-head.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
<!-- Fira Code for code snippets -->
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Fira+Code:400" type="text/css" media="all">

<style>
html {
background-color: unset !important;
Expand Down
2 changes: 1 addition & 1 deletion .storybook/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default create({

// Typography
fontBase: '"Source Sans Pro", sans-serif',
fontCode: '"Fira Code", monospace',
fontCode: '"JetBrains Mono", monospace',

// Text colors
textColor: 'rgb(0, 0, 0)',
Expand Down
2 changes: 1 addition & 1 deletion 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": "@creativecommons/vocabulary",
"version": "1.0.0-beta.14",
"version": "1.0.0-beta.15",
"description": "A cohesive design system to unite the web facing Creative Commons",
"author": "Creative Commons (https://creativecommons.org)",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions src/styles/typography.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import url("https://unpkg.com/@creativecommons/fonts@1.0.0-beta.8/css/fonts.css");
@import url("https://unpkg.com/@creativecommons/fonts@1.0.0-beta.9/css/fonts.css");

// Families
$family-roboto-condensed: 'Roboto Condensed', sans-serif;
$family-source-sans-pro: 'Source Sans Pro', sans-serif;
$family-fira-code: monospace; // Maybe later
$family-jetbrains-mono: 'JetBrains Mono', monospace;
$family-system: BlinkMacSystemFont, -apple-system, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
'Droid Sans', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;

Expand All @@ -27,7 +27,7 @@ $font-size-caption: 0.8rem;
// Overrides
$family-sans-serif: $family-source-sans-pro;
$family-alternative: $family-roboto-condensed;
$family-monospace: $family-fira-code;
$family-monospace: $family-jetbrains-mono;

// Classes
$body-font-sizes: (
Expand Down Expand Up @@ -63,7 +63,7 @@ $body-font-sizes: (

.monospace {
font-family: $family-monospace;
font-size: 0.875em; // Fira Code at 14px is similar to other fonts at 16px
font-size: 0.875em; // Code fonts at 14px are similar to other fonts at 16px
}

// Usage
Expand Down

0 comments on commit 43ce54d

Please sign in to comment.