Permalink
Browse files

Merge branch 'feat/browser_fonts'

  • Loading branch information...
jkcclemens committed Dec 14, 2018
2 parents 0ab9a75 + 6db40d3 commit 49ce2cd294a25e554b625f890e1ae1f4f96a7c2a
@@ -32,6 +32,10 @@ $dimensions: 16 24 32 48 64 96 128 256;
$body-size: 16px;
$size-6: 1rem;

// set fonts to user's chosen fonts
$family-sans-serif: sans-serif;
$family-monospace: monospace;

@import "bulma/sass/utilities/derived-variables";

@import "bulma/bulma";
@@ -132,42 +136,3 @@ div.codesass.codesass--has-line-numbers::before {
.message.is-warning .message-body pre {
color: #000;
}

// fonts

/* lato-regular - latin_latin-ext */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 400;
src: local('Lato Regular'), local('Lato-Regular'),
url('/static/fonts/lato/lato-v14-latin_latin-ext-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('/static/fonts/lato/lato-v14-latin_latin-ext-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* lato-italic - latin_latin-ext */
@font-face {
font-family: 'Lato';
font-style: italic;
font-weight: 400;
src: local('Lato Italic'), local('Lato-Italic'),
url('/static/fonts/lato/lato-v14-latin_latin-ext-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('/static/fonts/lato/lato-v14-latin_latin-ext-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* lato-700 - latin_latin-ext */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 700;
src: local('Lato Bold'), local('Lato-Bold'),
url('/static/fonts/lato/lato-v14-latin_latin-ext-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('/static/fonts/lato/lato-v14-latin_latin-ext-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* lato-700italic - latin_latin-ext */
@font-face {
font-family: 'Lato';
font-style: italic;
font-weight: 700;
src: local('Lato Bold Italic'), local('Lato-BoldItalic'),
url('/static/fonts/lato/lato-v14-latin_latin-ext-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('/static/fonts/lato/lato-v14-latin_latin-ext-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
@@ -1,4 +1,6 @@
$dimensions: 16 24 32 48 64 96 128 256;
$family-sans-serif: sans-serif;
$family-monospace: monospace;

@import "bulma/bulma";
@import "custom";

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
@@ -6,12 +6,12 @@
title="dark"
rel="stylesheet"
href="/static/css/dark-style.css?v={{ resources_version }}"
integrity="sha384-bifAWZqCiB6PGUgqBGHj5Pijnd7AlFn325JzVKa7Z8UrnaGXN1s8NakvUYo5rTFU"/>
integrity="sha384-OBYHGgtx9fmd3B0DH4T+BTz1fX8VC+bg7rcbIGSwmAnrTmATXZjjXNrXJsiI1d0Z"/>
<link
title="light"
rel="stylesheet alternate"
href="/static/css/style.css?v={{ resources_version }}"
integrity="sha384-vdQqpSTC73SIpKMxIhJYQp8Gwzsqrnd+3k2RrwQd1G3DYLv3SG0gLdp/OeGo1+ih"/>
integrity="sha384-covd4g4K/xpuwlnsQzuzRJly+aFbUbcicz53wdtDBfOU7rJejul70tVkf5VR13b3"/>
<script
src="/static/js/style.js?v={{ resources_version }}"
integrity="sha384-HTYvuZHY1AndfrAqn+dIGFE7QognotxeUaFecs+e2FA30FKkHLfMyyLvBufM+eSk"></script>

0 comments on commit 49ce2cd

Please sign in to comment.