adoralaura/hugo-book-theme
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add font-display for font fallback, move body font style to _fonts.scss

Browse source
This commit is contained in:
Alex Shpak 2019-05-22 09:08:15 +02:00
parent e4a97bee27
commit 612814aa59
7 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
assets/custom.scss → assets/_custom.scss
View file

8
assets/_fonts.scss
View file

@ -3,6 +3,7 @@
font-family: 'Oxygen'; font-family: 'Oxygen';
font-style: normal; font-style: normal;
font-weight: 300; font-weight: 300;
font-display: swap;
src: url('/fonts/oxygen-v8-latin-300.eot'); /* IE9 Compat Modes */ src: url('/fonts/oxygen-v8-latin-300.eot'); /* IE9 Compat Modes */
src: local('Oxygen Light'), local('Oxygen-Light'), src: local('Oxygen Light'), local('Oxygen-Light'),
url('/fonts/oxygen-v8-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('/fonts/oxygen-v8-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@ -16,6 +17,7 @@
font-family: 'Oxygen'; font-family: 'Oxygen';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-display: swap;
src: url('/fonts/oxygen-v8-latin-regular.eot'); /* IE9 Compat Modes */ src: url('/fonts/oxygen-v8-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Oxygen Regular'), local('Oxygen-Regular'), src: local('Oxygen Regular'), local('Oxygen-Regular'),
url('/fonts/oxygen-v8-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('/fonts/oxygen-v8-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@ -29,6 +31,7 @@
font-family: 'Oxygen'; font-family: 'Oxygen';
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
font-display: swap;
src: url('/fonts/oxygen-v8-latin-700.eot'); /* IE9 Compat Modes */ src: url('/fonts/oxygen-v8-latin-700.eot'); /* IE9 Compat Modes */
src: local('Oxygen Bold'), local('Oxygen-Bold'), src: local('Oxygen Bold'), local('Oxygen-Bold'),
url('/fonts/oxygen-v8-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('/fonts/oxygen-v8-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@ -42,6 +45,7 @@
font-family: 'Oxygen Mono'; font-family: 'Oxygen Mono';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-display: swap;
src: url('/fonts/oxygen-mono-v6-latin-regular.eot'); /* IE9 Compat Modes */ src: url('/fonts/oxygen-mono-v6-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Oxygen Mono'), local('OxygenMono-Regular'), src: local('Oxygen Mono'), local('OxygenMono-Regular'),
url('/fonts/oxygen-mono-v6-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('/fonts/oxygen-mono-v6-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@ -50,3 +54,7 @@
url('/fonts/oxygen-mono-v6-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('/fonts/oxygen-mono-v6-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('/fonts/oxygen-mono-v6-latin-regular.svg#OxygenMono') format('svg'); /* Legacy iOS */ url('/fonts/oxygen-mono-v6-latin-regular.svg#OxygenMono') format('svg'); /* Legacy iOS */
} }
body {
font-family: "Oxygen", sans-serif;
}

15
assets/book.scss
View file

@ -2,7 +2,6 @@
@import "variables"; @import "variables";
@import "markdown"; @import "markdown";
@import "utils"; @import "utils";
@import "fonts";
html { html {
font-size: $font-size-base; font-size: $font-size-base;
@ -20,7 +19,7 @@ body {
color: $body-font-color; color: $body-font-color;
background: $body-background; background: $body-background;
font-family: "Oxygen",sans-serif; font-family: sans-serif;
font-weight: $body-font-weight; font-weight: $body-font-weight;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
@ -68,7 +67,7 @@ aside nav ul {
} }
a:hover { a:hover {
opacity: .5; opacity: 0.5;
} }
ul { ul {
@ -111,8 +110,9 @@ ul.pagination {
.book-section-flat { .book-section-flat {
margin-bottom: $padding-16 * 2; margin-bottom: $padding-16 * 2;
> a, > span { > a,
font-weight: 600 > span {
font-weight: 600;
} }
> ul { > ul {
@ -238,5 +238,8 @@ aside nav,
} }
} }
// Add fonts
@import "fonts";
// Add custom defined styles // Add custom defined styles
@import 'custom' @import "custom";

1
exampleSite/assets/_custom.scss Normal file
View file

@ -0,0 +1 @@
@import "variables";

1
exampleSite/assets/custom.scss
View file

@ -1 +0,0 @@
@import "variables"

2
exampleSite/resources/_gen/assets/scss/book.scss_48b060fe05b0a273d182ef83c0605941.content
View file

File diff suppressed because one or more lines are too long

2
exampleSite/resources/_gen/assets/scss/book.scss_48b060fe05b0a273d182ef83c0605941.json
View file

@ -1 +1 @@
{"Target":"book.min.f01bf3a7011d6c44849387baca0b2a129a6d40773c6c09bc5208649174d810a2.css","MediaType":"text/css","Data":{"Integrity":"sha256-8BvzpwEdbESEk4e6ygsqEpptQHc8bAm8UghkkXTYEKI="}} {"Target":"book.min.a7f2160cdf1e5775f3754e8d34cce9f404c64bff092efe992263805e4efeec6c.css","MediaType":"text/css","Data":{"Integrity":"sha256-p/IWDN8eV3XzdU6NNMzp9ATGS/8JLv6ZImOAXk7+7Gw="}}