diff --git a/assets/scss/partials/_main.scss b/assets/scss/partials/_main.scss index 99f61df..cf0bed6 100644 --- a/assets/scss/partials/_main.scss +++ b/assets/scss/partials/_main.scss @@ -1,14 +1,10 @@ * { box-sizing: border-box; } -a { - color: rgb(255, 130, 130); - text-decoration: none; +@font-face { + font-family: PoppinsLatin; + src: url(/fonts/PoppinsLatin-Regular.otf); } -a:hover { - text-decoration: underline; -} - html { scrollbar-width: thin; scrollbar-color: rgb(255, 130, 130) rgb(60, 60, 90); @@ -17,10 +13,17 @@ body { background: rgb(40, 40, 60); color: rgb(240, 240, 255); margin: 0; - font-family: Monaco, Lucida Console, monospace; + font-family: PoppinsLatin, Monaco, Lucida Console, monospace; display: grid; overflow-x: hidden; } +a { + color: rgb(255, 130, 130); + text-decoration: none; +} +a:hover { + text-decoration: underline; +} .container { width: calc(100% - 40px); diff --git a/config.yaml b/config.yaml index 7a443fa..fae33b2 100644 --- a/config.yaml +++ b/config.yaml @@ -26,7 +26,7 @@ menu: - identifier: feed name: feed (rss) title: rss-feed - url: https://vrifox.cc/vrifox.cc_hugo/blog/index.xml + url: https://vrifox.cc/blog/index.xml weight: 1 - identifier: sourcecode name: source code diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 2819b82..c853928 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -8,9 +8,9 @@

- {{ .Date.Format "2. January 2006" }} - {{ with .Params.author }}by{{ end }} - {{ .Params.author }} + {{ if eq .Params.type "project" }}latest update: {{ .Date.Format "2. January 2006" }}{{ end }} + {{ if ne .Params.type "project" }}{{ .Date.Format "2. January 2006" }}{{ end }} + {{ with .Params.author }}by {{ end }}{{ .Params.author }}

{{ .Title }}

{{ with .Params.featured_image }} diff --git a/resources/_gen/assets/scss/scss/_default/list.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/scss/_default/list.scss_f300667da4f5b5f84e1a9e0702b2fdde.content index d565af7..5ba2bed 100644 --- a/resources/_gen/assets/scss/scss/_default/list.scss_f300667da4f5b5f84e1a9e0702b2fdde.content +++ b/resources/_gen/assets/scss/scss/_default/list.scss_f300667da4f5b5f84e1a9e0702b2fdde.content @@ -1,12 +1,9 @@ * { box-sizing: border-box; } -a { - color: #ff8282; - text-decoration: none; } - -a:hover { - text-decoration: underline; } +@font-face { + font-family: PoppinsLatin; + src: url(/fonts/PoppinsLatin-Regular.otf); } html { scrollbar-width: thin; @@ -16,10 +13,17 @@ body { background: #28283c; color: #f0f0ff; margin: 0; - font-family: Monaco, Lucida Console, monospace; + font-family: PoppinsLatin, Monaco, Lucida Console, monospace; display: grid; overflow-x: hidden; } +a { + color: #ff8282; + text-decoration: none; } + +a:hover { + text-decoration: underline; } + .container { width: calc(100% - 40px); max-width: 1140px; diff --git a/resources/_gen/assets/scss/scss/_default/single.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/scss/_default/single.scss_f300667da4f5b5f84e1a9e0702b2fdde.content index 7e4a1b5..c0c0f86 100644 --- a/resources/_gen/assets/scss/scss/_default/single.scss_f300667da4f5b5f84e1a9e0702b2fdde.content +++ b/resources/_gen/assets/scss/scss/_default/single.scss_f300667da4f5b5f84e1a9e0702b2fdde.content @@ -1,12 +1,9 @@ * { box-sizing: border-box; } -a { - color: #ff8282; - text-decoration: none; } - -a:hover { - text-decoration: underline; } +@font-face { + font-family: PoppinsLatin; + src: url(/fonts/PoppinsLatin-Regular.otf); } html { scrollbar-width: thin; @@ -16,10 +13,17 @@ body { background: #28283c; color: #f0f0ff; margin: 0; - font-family: Monaco, Lucida Console, monospace; + font-family: PoppinsLatin, Monaco, Lucida Console, monospace; display: grid; overflow-x: hidden; } +a { + color: #ff8282; + text-decoration: none; } + +a:hover { + text-decoration: underline; } + .container { width: calc(100% - 40px); max-width: 1140px; diff --git a/resources/_gen/assets/scss/scss/index.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/scss/index.scss_f300667da4f5b5f84e1a9e0702b2fdde.content index 8011d1f..61185fe 100644 --- a/resources/_gen/assets/scss/scss/index.scss_f300667da4f5b5f84e1a9e0702b2fdde.content +++ b/resources/_gen/assets/scss/scss/index.scss_f300667da4f5b5f84e1a9e0702b2fdde.content @@ -1,12 +1,9 @@ * { box-sizing: border-box; } -a { - color: #ff8282; - text-decoration: none; } - -a:hover { - text-decoration: underline; } +@font-face { + font-family: PoppinsLatin; + src: url(/fonts/PoppinsLatin-Regular.otf); } html { scrollbar-width: thin; @@ -16,10 +13,17 @@ body { background: #28283c; color: #f0f0ff; margin: 0; - font-family: Monaco, Lucida Console, monospace; + font-family: PoppinsLatin, Monaco, Lucida Console, monospace; display: grid; overflow-x: hidden; } +a { + color: #ff8282; + text-decoration: none; } + +a:hover { + text-decoration: underline; } + .container { width: calc(100% - 40px); max-width: 1140px; diff --git a/resources/_gen/assets/scss/scss/projects/list.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/scss/projects/list.scss_f300667da4f5b5f84e1a9e0702b2fdde.content index 3fa3ebf..3f06464 100644 --- a/resources/_gen/assets/scss/scss/projects/list.scss_f300667da4f5b5f84e1a9e0702b2fdde.content +++ b/resources/_gen/assets/scss/scss/projects/list.scss_f300667da4f5b5f84e1a9e0702b2fdde.content @@ -1,12 +1,9 @@ * { box-sizing: border-box; } -a { - color: #ff8282; - text-decoration: none; } - -a:hover { - text-decoration: underline; } +@font-face { + font-family: PoppinsLatin; + src: url(/fonts/PoppinsLatin-Regular.otf); } html { scrollbar-width: thin; @@ -16,10 +13,17 @@ body { background: #28283c; color: #f0f0ff; margin: 0; - font-family: Monaco, Lucida Console, monospace; + font-family: PoppinsLatin, Monaco, Lucida Console, monospace; display: grid; overflow-x: hidden; } +a { + color: #ff8282; + text-decoration: none; } + +a:hover { + text-decoration: underline; } + .container { width: calc(100% - 40px); max-width: 1140px; diff --git a/static/fonts/OFL.txt b/static/fonts/OFL.txt new file mode 100644 index 0000000..9f5f77d --- /dev/null +++ b/static/fonts/OFL.txt @@ -0,0 +1,94 @@ +Copyright 2014-2019 Indian Type Foundry (info@indiantypefoundry.com) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + diff --git a/static/fonts/PoppinsLatin-Regular.otf b/static/fonts/PoppinsLatin-Regular.otf new file mode 100644 index 0000000..7a1156b Binary files /dev/null and b/static/fonts/PoppinsLatin-Regular.otf differ