aditya/hugo-theme-introduction
1
0
Fork 0
mirror of https://git.adityakumar.xyz/hugo-theme-introduction.git synced 2024-11-21 19:42:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Font fixes

Browse source 
- Put fonts styles in _fonts.sass
- Stop overriding $fa-font-path in vendor/fontawesome-free/scss/_variables.scss
- Clean up style.sass imports
This commit is contained in:
Victoria Drake 2020-12-31 07:11:22 -05:00
parent 87eb51f115
commit 7167496d88
4 changed files with 3683 additions and 3683 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assets/sass/_fonts.sass
View file

@ -1,9 +1,11 @@
$nunito-font-path: '{{ with resources.Get "fonts/NunitoSans/NunitoSans-Regular.ttf" }}{{.Permalink}}{{ end }}'
/* vietnamese */ /* vietnamese */
@font-face @font-face
font-family: "Nunito Sans" font-family: "Nunito Sans"
font-style: normal font-style: normal
font-weight: normal font-weight: normal
src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}/NunitoSans-Regular.ttf) format("woff2") src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}) format("woff2")
unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB
/* latin-ext */ /* latin-ext */
@ -11,7 +13,7 @@
font-family: "Nunito Sans" font-family: "Nunito Sans"
font-style: normal font-style: normal
font-weight: normal font-weight: normal
src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}/NunitoSans-Regular.ttf) format("woff2") src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}) format("woff2")
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF
/* latin */ /* latin */
@ -19,5 +21,7 @@
font-family: "Nunito Sans" font-family: "Nunito Sans"
font-style: normal font-style: normal
font-weight: normal font-weight: normal
src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}/NunitoSans-Regular.ttf) format("woff2") src: local("Nunito Sans Regular"), local("NunitoSans-Regular"), url(#{$nunito-font-path}) format("woff2")
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD
@import "fontawesome-import"

22
assets/sass/style.sass
View file

@ -1,31 +1,19 @@
{{ $themeStyle := .Site.Params.themeStyle | default "light" }} {{ $themeStyle := .Site.Params.themeStyle | default "light" }}
$fa-font-path: '{{ urls.Parse "/fonts/fontawesome-free/webfonts" }}'
$nunito-font-path: '{{ urls.Parse "/fonts/NunitoSans" }}'
{{ if eq $themeStyle "auto" }} {{ if eq $themeStyle "auto" }}
@import "fonts"
@import "light-variables" @import "light-variables"
@import "base-variables"
@import "bulma-import"
@import "fontawesome-import"
@import "base"
@import "light-style" @import "light-style"
@media (prefers-color-scheme: dark) @media (prefers-color-scheme: dark)
@import "fonts"
@import "dark-variables" @import "dark-variables"
@import "base-variables"
@import "bulma-import"
@import "fontawesome-import"
@import "base"
@import "dark-style" @import "dark-style"
{{ else }} {{ else }}
@import "fonts"
@import "{{ $themeStyle }}-variables" @import "{{ $themeStyle }}-variables"
@import "base-variables"
@import "bulma-import"
@import "fontawesome-import"
@import "base"
@import "{{ $themeStyle }}-style" @import "{{ $themeStyle }}-style"
{{ end }} {{ end }}
@import "fonts"
@import "base-variables"
@import "bulma-import"
@import "base"

2
assets/vendor/fontawesome-free/scss/_variables.scss generated vendored
View file

@ -1,7 +1,7 @@
// Variables // Variables
// -------------------------- // --------------------------
$fa-font-path: "../webfonts" !default; $fa-font-path: "/fonts/fontawesome-free/webfonts/" !default;
$fa-font-size-base: 16px !default; $fa-font-size-base: 16px !default;
$fa-css-prefix: fa !default; $fa-css-prefix: fa !default;
$fa-version: "5.2.0" !default; $fa-version: "5.2.0" !default;

7332
exampleSite/resources/_gen/assets/sass/sass/style.sass_7642ba43b3212fd7d7ba324df3b88b0c.content generated
View file

File diff suppressed because it is too large Load diff