diff options
author | dataCobra <datacobra@mailbox.org> | 2020-08-29 14:10:45 +0300 |
---|---|---|
committer | dataCobra <datacobra@mailbox.org> | 2020-08-29 14:10:45 +0300 |
commit | 94a28bafbfa328d2ebdff955bc482d16e0d32a7e (patch) | |
tree | 82368be167b92ddcfb12e3027a782dd6bb8772e4 | |
parent | 9ec5e11bb8df8f167bad5e245f4051e6067fc106 (diff) | |
parent | 55c54286178e7eeff419e9808cef3507889fceba (diff) |
Merge branch 'develop'2.1.1
* develop:
Fix #28 (Value should be inside double quotes)
Add Roboto Mono as new font for code
Update FontAwesome to version 5.14.0
Update content links with relURL feature
Delete taxnomoie settings for homepage.md
-rw-r--r-- | exampleSite/config.toml | 4 | ||||
-rw-r--r-- | layouts/_default/single.html | 6 | ||||
-rw-r--r-- | layouts/index.html | 34 | ||||
-rw-r--r-- | layouts/partials/head.html | 18 | ||||
-rw-r--r-- | layouts/partials/header.html | 6 | ||||
-rw-r--r-- | static/css/all.css | 106 | ||||
-rw-r--r-- | static/css/main.css | 10 | ||||
-rw-r--r-- | static/webfonts/RobotoMono-Regular.woff | bin | 0 -> 26464 bytes | |||
-rw-r--r-- | static/webfonts/fa-brands-400.woff | bin | 89824 -> 90672 bytes | |||
-rw-r--r-- | static/webfonts/fa-regular-400.woff | bin | 16800 -> 16780 bytes | |||
-rw-r--r-- | static/webfonts/fa-solid-900.woff | bin | 103300 -> 104004 bytes |
11 files changed, 97 insertions, 87 deletions
diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 5e90cc6..c1b5fbe 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -57,8 +57,8 @@ googleAnalytics = "" # Deactivate Taxonomies for specific page types #disableTaxoTypes = [""] - # Custom CSS applied to default styles. (Path is static/css/) - #customCSS = "custom.css" + # Custom CSS applied to default styles. (Path could be "static/css/") + #customCSS = "css/custom.css" # Comments [params.comments] diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 9953102..4352a5b 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,7 +2,7 @@ <div class="post"> {{ if isset .Params "image" }} <div class="post-image"> - <img src="{{ .Params.image }}" {{ if isset .Params "imagetext" }}alt="{{ .Params.imagetext }}"{{ end }}> + <img src="{{ relURL .Params.image }}" {{ if isset .Params "imagetext" }}alt="{{ .Params.imagetext }}"{{ end }}> </div> {{ end }} <div class="author"> @@ -10,7 +10,7 @@ {{ if isset .Params "author" }} <p> {{ if isset .Params "authorlink" }} - {{ i18n "authorpretext" }} <a href="{{ .Params.authorlink }}">{{ .Params.author }}</a> + {{ i18n "authorpretext" }} <a href="{{ relURL .Params.authorlink }}">{{ .Params.author }}</a> {{ else }} {{ i18n "authorpretext" }} {{ .Params.author }} {{ end }} @@ -53,7 +53,7 @@ {{ range $key, $value := $taxonomy }} {{ range $value.Pages }} {{ if eq .LinkTitle $pagename }} - <a href="{{ .Site.BaseURL }}{{ $taxonomyname }}/{{ $key }}/"> {{ $key }} </a> + <a href="{{ relURL $taxonomyname }}/{{ $key }}/"> {{ $key }} </a> {{ end }} {{ end }} {{ end }} diff --git a/layouts/index.html b/layouts/index.html index 4eddbca..2954d79 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -4,7 +4,7 @@ <div class="post"> {{ if isset .Params "image" }} <div class="post-image"> - <img src="{{ .Params.image }}" {{ if isset .Params "imagetext" }}alt="{{ .Params.imagetext }}"{{ end }}> + <img src="{{ relURL .Params.image }}" {{ if isset .Params "imagetext" }}alt="{{ .Params.imagetext }}"{{ end }}> </div> {{ end }} <div class="author"> @@ -12,7 +12,7 @@ {{ if isset .Params "author" }} <p> {{ if isset .Params "authorlink" }} - {{ i18n "authorpretext" }} <a href="{{ .Params.authorlink }}">{{ .Params.author }}</a> + {{ i18n "authorpretext" }} <a href="{{ relURL .Params.authorlink }}">{{ .Params.author }}</a> {{ else }} {{ i18n "authorpretext" }} {{ .Params.author }} {{ end }} @@ -38,36 +38,6 @@ <div class="markdown"> {{ .Content }} </div> - {{ if ne (in .Site.Params.disableTaxoTypes .Type) true }} - {{ $pagename := .Page.Title }} - {{ $notaxo := .Params.notaxonomy }} - {{ range $taxonomyname, $taxonomy := .Site.Taxonomies }} - {{ with index $.Params $taxonomyname }} - {{ with ($.Site.GetPage (printf "/%s" $taxonomyname)) }} - {{ if in $notaxo $taxonomyname }} - {{ else }} - <div class="tags"> - <div class="taxosfloating_left"> - <p>{{ $taxonomyname | humanize }}</p> - </div> - <div class="termsfloating_right"> - <p> - {{ range $key, $value := $taxonomy }} - {{ range $value.Pages }} - {{ if eq .LinkTitle $pagename }} - <a href="/{{ $taxonomyname }}/{{ $key }}/"> {{ $key }} </a> - {{ end }} - {{ end }} - {{ end }} - </p> - </div> - <div class="clearit"></div> - {{ end }} - {{ end }} - {{ end }} - {{ end }} - {{ end }} - </div> {{- if eq .Site.Params.comments.enabled true -}} {{- $.Scratch.Set "comments" true -}} {{- if and (isset .Params "type") (in .Site.Params.comments.disableOnTypes .Params.type) -}} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index aebf21a..af9cb77 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -20,26 +20,26 @@ {{- template "_internal/twitter_cards.html" . -}} <!-- If favicon is true in config use the favicon files--> {{- if eq .Site.Params.favicon true -}} - <link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"> - <link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"> + <link rel="icon" type="image/png" href="{{ relURL "/favicon-32x32.png" }}" sizes="32x32"> + <link rel="icon" type="image/png" href="{{ relURL "/favicon-16x16.png" }}" sizes="16x16"> {{- end -}} <!-- Add rss+xml functionality --> {{- with .OutputFormats.Get "rss" -}} {{ printf `<link rel="%s" type="%s" href="%s" title="%s">` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} {{- end -}} <!-- Add all css files that are necessary --> - <link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/normalize.css" /> - <link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/main.css" /> - <link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/all.css" /> + <link rel="stylesheet" type="text/css" media="screen" href="{{ relURL "/css/normalize.css" }}" /> + <link rel="stylesheet" type="text/css" media="screen" href="{{ relURL "/css/main.css" }}" /> + <link rel="stylesheet" type="text/css" media="screen" href="{{ relURL "/css/all.css" }}" /> <!-- Add math typesetting with KaTeX if math is set --> {{- if or .Params.math .Site.Params.math -}} - <link rel="stylesheet" href="{{ .Site.BaseURL }}css/katex.min.css" crossorigin="anonymous"> - <script defer src="{{ .Site.BaseURL }}js/katex.min.js" integrity="sha384-y23I5Q6l+B6vatafAwxRu/0oK/79VlbSz7Q9aiSZUvyWYIYsd+qj+o24G5ZU2zJz" crossorigin="anonymous"></script> - <script defer src="{{ .Site.BaseURL }}js/auto-render.min.js" integrity="sha384-kWPLUVMOks5AQFrykwIup5lo0m3iMkkHrD0uJ4H5cjeGihAutqP0yW0J6dpFiVkI" crossorigin="anonymous" onload="renderMathInElement(document.body);"></script> + <link rel="stylesheet" href="{{ relURL "/css/katex.min.css" }}" crossorigin="anonymous"> + <script defer src="{{ relURL "js/katex.min.js" }}" integrity="sha384-y23I5Q6l+B6vatafAwxRu/0oK/79VlbSz7Q9aiSZUvyWYIYsd+qj+o24G5ZU2zJz" crossorigin="anonymous"></script> + <script defer src="{{ relURL "js/auto-render.min.js" }}" integrity="sha384-kWPLUVMOks5AQFrykwIup5lo0m3iMkkHrD0uJ4H5cjeGihAutqP0yW0J6dpFiVkI" crossorigin="anonymous" onload="renderMathInElement(document.body);"></script> {{- end -}} <!-- Use customcss if you like --> {{- if isset .Site.Params "customcss" -}} - <link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/{{ .Site.Params.customCSS }}" /> + <link rel="stylesheet" type="text/css" media="screen" href="{{ relURL .Site.Params.customCSS }}" /> {{- end -}} <!-- Use a SEO friendly title tag--> {{- if .IsHome -}} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 810cf56..b5caddc 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -2,7 +2,7 @@ {{ if .Site.Params.Avatar }} <div id="avatar"> <a href="{{ .Site.BaseURL }}"> - <img src="{{ .Site.Params.Avatar }}" alt="{{ .Site.Title }}"> + <img src="{{ relURL .Site.Params.Avatar }}" alt="{{ .Site.Title }}"> </a> </div> {{ end }} @@ -17,11 +17,11 @@ {{- if isset .Site.Params "subtitle" -}} <p id="subtitle">{{ .Site.Params.Subtitle | markdownify }}</p> {{- end -}} - <div id=social> + <div id="social"> <nav> <ul> {{- range $index, $key := .Site.Params.Social -}} - <li><a href="{{ $key.url }}"><i title="{{ $key.name }}" class="icons {{ $key.icon }}"></i></a></li> + <li><a href="{{ relURL $key.url }}"><i title="{{ $key.name }}" class="icons {{ $key.icon }}"></i></a></li> {{- end -}} </ul> </nav> diff --git a/static/css/all.css b/static/css/all.css index a11eee1..bf4097d 100644 --- a/static/css/all.css +++ b/static/css/all.css @@ -1,5 +1,5 @@ /*! - * Font Awesome Free 5.13.0 by @fontawesome - https://fontawesome.com + * Font Awesome Free 5.14.0 by @fontawesome - https://fontawesome.com * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) */ .fa, @@ -441,6 +441,12 @@ readers do not read off random characters that represent icons */ .fa-bacon:before { content: "\f7e5"; } +.fa-bacteria:before { + content: "\e059"; } + +.fa-bacterium:before { + content: "\e05a"; } + .fa-bahai:before { content: "\f666"; } @@ -631,7 +637,7 @@ readers do not read off random characters that represent icons */ content: "\f49e"; } .fa-box-tissue:before { - content: "\f95b"; } + content: "\e05b"; } .fa-boxes:before { content: "\f468"; } @@ -1207,7 +1213,7 @@ readers do not read off random characters that represent icons */ content: "\f6ca"; } .fa-dailymotion:before { - content: "\f952"; } + content: "\e052"; } .fa-dashcube:before { content: "\f210"; } @@ -1218,6 +1224,9 @@ readers do not read off random characters that represent icons */ .fa-deaf:before { content: "\f2a4"; } +.fa-deezer:before { + content: "\e077"; } + .fa-delicious:before { content: "\f1a5"; } @@ -1401,6 +1410,9 @@ readers do not read off random characters that represent icons */ .fa-edge:before { content: "\f282"; } +.fa-edge-legacy:before { + content: "\e078"; } + .fa-edit:before { content: "\f044"; } @@ -1531,7 +1543,7 @@ readers do not read off random characters that represent icons */ content: "\f050"; } .fa-faucet:before { - content: "\f905"; } + content: "\e005"; } .fa-fax:before { content: "\f1ac"; } @@ -1654,7 +1666,7 @@ readers do not read off random characters that represent icons */ content: "\f269"; } .fa-firefox-browser:before { - content: "\f907"; } + content: "\e007"; } .fa-first-aid:before { content: "\f479"; } @@ -1893,6 +1905,9 @@ readers do not read off random characters that represent icons */ .fa-google-drive:before { content: "\f3aa"; } +.fa-google-pay:before { + content: "\e079"; } + .fa-google-play:before { content: "\f3ab"; } @@ -2020,7 +2035,7 @@ readers do not read off random characters that represent icons */ content: "\f4be"; } .fa-hand-holding-medical:before { - content: "\f95c"; } + content: "\e05c"; } .fa-hand-holding-usd:before { content: "\f4c0"; } @@ -2062,7 +2077,7 @@ readers do not read off random characters that represent icons */ content: "\f257"; } .fa-hand-sparkles:before { - content: "\f95d"; } + content: "\e05d"; } .fa-hand-spock:before { content: "\f259"; } @@ -2074,16 +2089,16 @@ readers do not read off random characters that represent icons */ content: "\f4c4"; } .fa-hands-wash:before { - content: "\f95e"; } + content: "\e05e"; } .fa-handshake:before { content: "\f2b5"; } .fa-handshake-alt-slash:before { - content: "\f95f"; } + content: "\e05f"; } .fa-handshake-slash:before { - content: "\f960"; } + content: "\e060"; } .fa-hanukiah:before { content: "\f6e6"; } @@ -2107,16 +2122,16 @@ readers do not read off random characters that represent icons */ content: "\f0a0"; } .fa-head-side-cough:before { - content: "\f961"; } + content: "\e061"; } .fa-head-side-cough-slash:before { - content: "\f962"; } + content: "\e062"; } .fa-head-side-mask:before { - content: "\f963"; } + content: "\e063"; } .fa-head-side-virus:before { - content: "\f964"; } + content: "\e064"; } .fa-heading:before { content: "\f1dc"; } @@ -2221,7 +2236,7 @@ readers do not read off random characters that represent icons */ content: "\f6f1"; } .fa-house-user:before { - content: "\f965"; } + content: "\e065"; } .fa-houzz:before { content: "\f27c"; } @@ -2257,7 +2272,7 @@ readers do not read off random characters that represent icons */ content: "\f47f"; } .fa-ideal:before { - content: "\f913"; } + content: "\e013"; } .fa-igloo:before { content: "\f7ae"; } @@ -2293,7 +2308,7 @@ readers do not read off random characters that represent icons */ content: "\f16d"; } .fa-instagram-square:before { - content: "\f955"; } + content: "\e055"; } .fa-intercom:before { content: "\f7af"; } @@ -2410,7 +2425,7 @@ readers do not read off random characters that represent icons */ content: "\f5fc"; } .fa-laptop-house:before { - content: "\f966"; } + content: "\e066"; } .fa-laptop-medical:before { content: "\f812"; } @@ -2533,7 +2548,7 @@ readers do not read off random characters that represent icons */ content: "\f604"; } .fa-lungs-virus:before { - content: "\f967"; } + content: "\e067"; } .fa-lyft:before { content: "\f3c3"; } @@ -2662,7 +2677,7 @@ readers do not read off random characters that represent icons */ content: "\f753"; } .fa-microblog:before { - content: "\f91a"; } + content: "\e01a"; } .fa-microchip:before { content: "\f2db"; } @@ -2704,7 +2719,7 @@ readers do not read off random characters that represent icons */ content: "\f289"; } .fa-mixer:before { - content: "\f956"; } + content: "\e056"; } .fa-mizuni:before { content: "\f3cc"; } @@ -2944,7 +2959,7 @@ readers do not read off random characters that represent icons */ content: "\f704"; } .fa-people-arrows:before { - content: "\f968"; } + content: "\e068"; } .fa-people-carry:before { content: "\f4ce"; } @@ -3010,7 +3025,7 @@ readers do not read off random characters that represent icons */ content: "\f1a7"; } .fa-pied-piper-square:before { - content: "\f91e"; } + content: "\e01e"; } .fa-piggy-bank:before { content: "\f4d3"; } @@ -3043,7 +3058,7 @@ readers do not read off random characters that represent icons */ content: "\f5b0"; } .fa-plane-slash:before { - content: "\f969"; } + content: "\e069"; } .fa-play:before { content: "\f04b"; } @@ -3121,10 +3136,10 @@ readers do not read off random characters that represent icons */ content: "\f542"; } .fa-pump-medical:before { - content: "\f96a"; } + content: "\e06a"; } .fa-pump-soap:before { - content: "\f96b"; } + content: "\e06b"; } .fa-pushed:before { content: "\f3e1"; } @@ -3315,6 +3330,9 @@ readers do not read off random characters that represent icons */ .fa-rupee-sign:before { content: "\f156"; } +.fa-rust:before { + content: "\e07a"; } + .fa-sad-cry:before { content: "\f5b3"; } @@ -3412,7 +3430,7 @@ readers do not read off random characters that represent icons */ content: "\f3ed"; } .fa-shield-virus:before { - content: "\f96c"; } + content: "\e06c"; } .fa-ship:before { content: "\f21a"; } @@ -3427,7 +3445,7 @@ readers do not read off random characters that represent icons */ content: "\f54b"; } .fa-shopify:before { - content: "\f957"; } + content: "\e057"; } .fa-shopping-bag:before { content: "\f290"; } @@ -3471,6 +3489,9 @@ readers do not read off random characters that represent icons */ .fa-simplybuilt:before { content: "\f215"; } +.fa-sink:before { + content: "\e06d"; } + .fa-sistrix:before { content: "\f3ee"; } @@ -3565,7 +3586,7 @@ readers do not read off random characters that represent icons */ content: "\f7d2"; } .fa-soap:before { - content: "\f96e"; } + content: "\e06e"; } .fa-socks:before { content: "\f696"; } @@ -3733,7 +3754,7 @@ readers do not read off random characters that represent icons */ content: "\f2f2"; } .fa-stopwatch-20:before { - content: "\f96f"; } + content: "\e06f"; } .fa-store:before { content: "\f54e"; } @@ -3742,10 +3763,10 @@ readers do not read off random characters that represent icons */ content: "\f54f"; } .fa-store-alt-slash:before { - content: "\f970"; } + content: "\e070"; } .fa-store-slash:before { - content: "\f971"; } + content: "\e071"; } .fa-strava:before { content: "\f428"; } @@ -3957,6 +3978,9 @@ readers do not read off random characters that represent icons */ .fa-ticket-alt:before { content: "\f3ff"; } +.fa-tiktok:before { + content: "\e07b"; } + .fa-times:before { content: "\f00d"; } @@ -3985,7 +4009,7 @@ readers do not read off random characters that represent icons */ content: "\f71e"; } .fa-toilet-paper-slash:before { - content: "\f972"; } + content: "\e072"; } .fa-toolbox:before { content: "\f552"; } @@ -4015,7 +4039,7 @@ readers do not read off random characters that represent icons */ content: "\f637"; } .fa-trailer:before { - content: "\f941"; } + content: "\e041"; } .fa-train:before { content: "\f238"; } @@ -4126,7 +4150,7 @@ readers do not read off random characters that represent icons */ content: "\f404"; } .fa-unity:before { - content: "\f949"; } + content: "\e049"; } .fa-universal-access:before { content: "\f29a"; } @@ -4143,6 +4167,9 @@ readers do not read off random characters that represent icons */ .fa-unlock-alt:before { content: "\f13e"; } +.fa-unsplash:before { + content: "\e07c"; } + .fa-untappd:before { content: "\f405"; } @@ -4233,6 +4260,9 @@ readers do not read off random characters that represent icons */ .fa-users-cog:before { content: "\f509"; } +.fa-users-slash:before { + content: "\e073"; } + .fa-usps:before { content: "\f7e1"; } @@ -4300,13 +4330,13 @@ readers do not read off random characters that represent icons */ content: "\f1ca"; } .fa-virus:before { - content: "\f974"; } + content: "\e074"; } .fa-virus-slash:before { - content: "\f975"; } + content: "\e075"; } .fa-viruses:before { - content: "\f976"; } + content: "\e076"; } .fa-vk:before { content: "\f189"; } diff --git a/static/css/main.css b/static/css/main.css index 3dcee9e..9656a72 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -24,11 +24,20 @@ @font-face { font-family: 'Roboto Slab Regular'; + font-display: auto; font-style: normal; font-weight: 400; src: local('Roboto Slab Regular'), url('../webfonts/RobotoSlab-Regular.woff') format('woff'); } +@font-face { + font-family: 'Roboto Mono'; + font-display: auto; + font-style: normal; + font-weight: 400; + src: local('Roboto Mono'), url('../webfonts/RobotoMono-Regular.woff') format('woff'); +} + body { font-family: "Roboto Regular", serif; font-weight: 400; @@ -440,6 +449,7 @@ ul.flat li { } code, kbd, pre, samp { + font-family: "Roboto Mono", monospace; font-size: 0.95em; } diff --git a/static/webfonts/RobotoMono-Regular.woff b/static/webfonts/RobotoMono-Regular.woff Binary files differnew file mode 100644 index 0000000..44b84dd --- /dev/null +++ b/static/webfonts/RobotoMono-Regular.woff diff --git a/static/webfonts/fa-brands-400.woff b/static/webfonts/fa-brands-400.woff Binary files differindex 2a89d52..6cf6fb3 100644 --- a/static/webfonts/fa-brands-400.woff +++ b/static/webfonts/fa-brands-400.woff diff --git a/static/webfonts/fa-regular-400.woff b/static/webfonts/fa-regular-400.woff Binary files differindex 24de566..c390c60 100644 --- a/static/webfonts/fa-regular-400.woff +++ b/static/webfonts/fa-regular-400.woff diff --git a/static/webfonts/fa-solid-900.woff b/static/webfonts/fa-solid-900.woff Binary files differindex beec791..aff125d 100644 --- a/static/webfonts/fa-solid-900.woff +++ b/static/webfonts/fa-solid-900.woff |