diff options
| author | Gökmen Görgen <gkmngrgn@gmail.com> | 2020-01-29 22:35:17 +0300 |
|---|---|---|
| committer | Gökmen Görgen <gkmngrgn@gmail.com> | 2020-01-29 22:35:17 +0300 |
| commit | 2b12f27753ce3ab73c2c6c04a1151b68a74374e3 (patch) | |
| tree | 1153755861d3e9da98b1f277e0471eef848fb1a8 | |
| parent | 1134839ecc2782f596aca24ad5cc02e99aade9db (diff) | |
use Merriweather Sans for title, Fira Code for code.1.4.0
| -rw-r--r-- | README.md | 14 | ||||
| -rw-r--r-- | layouts/_default/baseof.html | 17 | ||||
| -rw-r--r-- | static/css/main.css | 4 | ||||
| -rw-r--r-- | theme.toml | 4 |
4 files changed, 13 insertions, 26 deletions
@@ -42,18 +42,18 @@ Websites that are using hugo with alaGeek theme: ## Dependency versions -* bootstrap: 4.3.1 -* highlightjs: 9.15.8 -* jquery-slim: 3.3.1 +* bootstrap: 4.4.1 +* highlightjs: 9.15.10 +* jquery-slim: 3.4.1 * mathjax: 2.7.5 * progressively: 1.2.5 -* webfont: 1.6.28 +* popper.js: 1.16.0 ## Typography -* *Raleway* for the titles, light but clearly visible -* *Merriweather* for the text, an awesome sans serif font to read without difficulties -* *Menlo* for the code +* Title: Merriweather Sans +* Content: Merriweather +* Code: Fira Code ## License diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index be6760e..2bacfcf 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -45,14 +45,10 @@ {{ end }} <link rel="shortcut icon" - href="{{ if .Site.Params.faviconfile }}{{ .Site.Params.faviconfile | absURL }}{{ else }}{{ .Site.BaseURL }}img/favicon.ico{{ end }}"> + href="{{ if .Site.Params.faviconfile }}{{ .Site.Params.faviconfile | absURL }}{{ else }}{{ .Site.BaseURL }}img/favicon.ico{{ end }}"> <link href='{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }}{{ end }}' rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> - - <noscript> - <link href="https://fonts.googleapis.com/css?family=Raleway:400,600,700" rel="stylesheet"> - <link href="https://fonts.googleapis.com/css?family=Merriweather:300,300i,700,700i" rel="stylesheet"> - </noscript> + <link href="https://fonts.googleapis.com/css?family=Fira+Code|Merriweather+Sans:400,700|Merriweather:400,700&display=swap" rel="stylesheet"> </head> <body> @@ -62,15 +58,6 @@ <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script> <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/webfont/1.6.28/webfontloader.js" integrity="sha256-4O4pS1SH31ZqrSO2A/2QJTVjTPqVe+jnYgOWUVr7EEc=" crossorigin="anonymous"></script> - <script> - WebFont.load({ - google: { - families: ['Raleway:400,600,700', 'Merriweather:300,300i,700,700i'] - } - }); - </script> - {{ if .Site.Params.highlightjs }} <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.10/highlight.min.js" integrity="sha256-1zu+3BnLYV9LdiY85uXMzii3bdrkelyp37e0ZyTAQh0=" crossorigin="anonymous"></script> {{ range .Site.Params.highlightjslanguages }} diff --git a/static/css/main.css b/static/css/main.css index bb94102..5716cce 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -11,9 +11,9 @@ --color-ko-fi: #dc3545; --color-bmc: #dc3545; - --font-title: "Raleway", sans-serif; - --font-code: "Menlo", monospace; + --font-code: "Fira Code", monospace; --font-content: "Merriweather", serif; + --font-title: "Merriweather Sans", sans-serif; } .badge-info { @@ -8,8 +8,8 @@ features = ["clean", "fast", "responsive", "typography", "disqus", "light", "dar min_version = "0.40.0" [author] - name = "Gökmen Görgen" - homepage = "https://gokmengorgen.net" + name = "Gökmen Görgen" + homepage = "https://gokmengorgen.net" [original] name = "Alexis Tacnet" |