Various changes to improve local loading of Oxygen.

This commit is contained in:
V.H. Belvadi 2019-05-14 07:33:07 +05:30 committed by Alex Shpak
parent 3920d5ff74
commit e4a97bee27
23 changed files with 25 additions and 30 deletions

View file

@ -3,50 +3,50 @@
font-family: 'Oxygen'; font-family: 'Oxygen';
font-style: normal; font-style: normal;
font-weight: 300; font-weight: 300;
src: url('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('oxygen-v8-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('/fonts/oxygen-v8-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('oxygen-v8-latin-300.woff2') format('woff2'), /* Super Modern Browsers */ url('/fonts/oxygen-v8-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
url('oxygen-v8-latin-300.woff') format('woff'), /* Modern Browsers */ url('/fonts/oxygen-v8-latin-300.woff') format('woff'), /* Modern Browsers */
url('oxygen-v8-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */ url('/fonts/oxygen-v8-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
url('oxygen-v8-latin-300.svg#Oxygen') format('svg'); /* Legacy iOS */ url('/fonts/oxygen-v8-latin-300.svg#Oxygen') format('svg'); /* Legacy iOS */
} }
/* oxygen-regular - latin */ /* oxygen-regular - latin */
@font-face { @font-face {
font-family: 'Oxygen'; font-family: 'Oxygen';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url('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('oxygen-v8-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('/fonts/oxygen-v8-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('oxygen-v8-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('/fonts/oxygen-v8-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('oxygen-v8-latin-regular.woff') format('woff'), /* Modern Browsers */ url('/fonts/oxygen-v8-latin-regular.woff') format('woff'), /* Modern Browsers */
url('oxygen-v8-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('/fonts/oxygen-v8-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('oxygen-v8-latin-regular.svg#Oxygen') format('svg'); /* Legacy iOS */ url('/fonts/oxygen-v8-latin-regular.svg#Oxygen') format('svg'); /* Legacy iOS */
} }
/* oxygen-700 - latin */ /* oxygen-700 - latin */
@font-face { @font-face {
font-family: 'Oxygen'; font-family: 'Oxygen';
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
src: url('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('oxygen-v8-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('/fonts/oxygen-v8-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('oxygen-v8-latin-700.woff2') format('woff2'), /* Super Modern Browsers */ url('/fonts/oxygen-v8-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
url('oxygen-v8-latin-700.woff') format('woff'), /* Modern Browsers */ url('/fonts/oxygen-v8-latin-700.woff') format('woff'), /* Modern Browsers */
url('oxygen-v8-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */ url('/fonts/oxygen-v8-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
url('oxygen-v8-latin-700.svg#Oxygen') format('svg'); /* Legacy iOS */ url('/fonts/oxygen-v8-latin-700.svg#Oxygen') format('svg'); /* Legacy iOS */
} }
/* oxygen-mono-regular - latin */ /* oxygen-mono-regular - latin */
@font-face { @font-face {
font-family: 'Oxygen Mono'; font-family: 'Oxygen Mono';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url('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('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 */
url('oxygen-mono-v6-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('/fonts/oxygen-mono-v6-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('oxygen-mono-v6-latin-regular.woff') format('woff'), /* Modern Browsers */ url('/fonts/oxygen-mono-v6-latin-regular.woff') format('woff'), /* Modern Browsers */
url('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('oxygen-mono-v6-latin-regular.svg#OxygenMono') format('svg'); /* Legacy iOS */ url('/fonts/oxygen-mono-v6-latin-regular.svg#OxygenMono') format('svg'); /* Legacy iOS */
} }

View file

@ -2,6 +2,7 @@
@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;

View file

@ -2,12 +2,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{- template "title" . }} | {{ .Site.Title -}}</title> <title>{{- template "title" . }} | {{ .Site.Title -}}</title>
<!-- Fonts for the theme -->
{{ if default true .Site.Params.googleFonts }}
{{ $fonts := resources.Get "_fonts.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }}
<link rel="stylesheet" href="{{ $fonts.RelPermalink }}">
{{ end }}
<!-- Theme stylesheet, you can customize scss by creatig `assets/custom.scss` in your website --> <!-- Theme stylesheet, you can customize scss by creatig `assets/custom.scss` in your website -->
{{ $styles := resources.Get "book.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }} {{ $styles := resources.Get "book.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }}
<link rel="stylesheet" href="{{ $styles.RelPermalink }}"> <link rel="stylesheet" href="{{ $styles.RelPermalink }}">

View file

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

View file

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

View file

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

View file

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB