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

Typefaces #55

Merged
merged 2 commits into from
Dec 2, 2018
Merged

Typefaces #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
279b30a
Install typeface packages
arcticicestudio Dec 2, 2018
b8ed6ae
Implement basic typography theme properties and values
arcticicestudio Dec 2, 2018
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
31 changes: 27 additions & 4 deletions package-lock.json
View file
Open in desktop

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

5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,13 @@
"gatsby-plugin-remove-trailing-slashes": "2.0.5",
"gatsby-source-filesystem": "2.0.9",
"gatsby-transformer-yaml": "2.1.5",
"inter-ui": "3.0.0",
"nord": ">=0.2.1 <1.0.0",
"prop-types": "15.6.2",
"react": "16.6.3",
"react-dom": "16.6.3",
"react-helmet": "5.2.0"
"react-helmet": "5.2.0",
"typeface-rubik": "0.0.54",
"typeface-source-code-pro": "0.0.54"
}
}
23 changes: 23 additions & 0 deletions src/styles/theme/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright (C) 2018-present Arctic Ice Studio <development@arcticicestudio.com>
* Copyright (C) 2018-present Sven Greb <development@svengreb.de>
*
* Project: Nord Docs
* Repository: https://github.com/arcticicestudio/nord-docs
* License: MIT
*/

/**
* @file The global theme.
* @author Arctic Ice Studio <development@arcticicestudio.com>
* @author Sven Greb <development@svengreb.de>
* @since 0.2.0
*/

import typography from "./typography";

const theme = { typography };

export { typography };

export default theme;
59 changes: 59 additions & 0 deletions src/styles/theme/typography.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Copyright (C) 2018-present Arctic Ice Studio <development@arcticicestudio.com>
* Copyright (C) 2018-present Sven Greb <development@svengreb.de>
*
* Project: Nord Docs
* Repository: https://github.com/arcticicestudio/nord-docs
* License: MIT
*/

/**
* @file Typefaces and font styles.
* @author Arctic Ice Studio <development@arcticicestudio.com>
* @author Sven Greb <development@svengreb.de>
* @since 0.2.0
*/

/**
* All available typefaces for different usage scopes.
*
* - `main` - The stylistic and visualization typeface used for as root (`<html>`) font family for all site elements.
* - `straight` - The factual and clear typeface for technical content and documentations.
* - `monospace` - The main monospaced font for all code related site elements.
*
* @type {object}
* @see https://fonts.google.com/specimen/Rubik
* @see https://rsms.me/inter
* @see https://fonts.google.com/specimen/Source+Code+Pro
*/
const typefaces = {
main: "Rubik",
straight: "Inter UI",
straightVariable: "Inter UI var",
monospace: "Source Code Pro"
};

/**
* The sizes based on the named "modular scale" ratio `1.125` (8:9 "major second"). Only one base is used with a value
* of `1` for the `em` unit.
*
* @see https://www.modularscale.com/?1&em&1.125
* @see https://polished.js.org/docs/#modularscale
*
* @type {object}
*/
const sizes = {
msBase: 1,
msBaseUnit: "em",
msRatio: 1.125,
root: 16,
rootUnit: "px",
weight: 400
};

const typography = {
sizes,
typefaces
};

export default typography;