From 0cd0d1235b8654032739bc3080a15e09a62ed196 Mon Sep 17 00:00:00 2001 From: Niklas Buschmann Date: Fri, 7 Feb 2020 21:20:47 +0100 Subject: [PATCH] merge upstream --- layouts/404.html | 4 +--- layouts/_default/baseof.html | 3 ++- static/css/index.css | 32 ++++++++++++++++++++++++-------- static/css/sidebar.css | 5 +++-- static/fonts/PT-Sans.css | 13 ------------- 5 files changed, 30 insertions(+), 27 deletions(-) delete mode 100644 static/fonts/PT-Sans.css diff --git a/layouts/404.html b/layouts/404.html index 2582013..52e7a35 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,9 +1,7 @@ {{ define "main" }}
-
-

404: Page not found

-
+

404: Page not found

Unfortunately, this page does not exist.

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 035389f..047eee0 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -12,7 +12,6 @@ {{- end }} - {{- if .Site.Params.sidebar }} {{- end }} @@ -28,6 +27,8 @@ {{ with .Site.Params.description }}{{ end }} + {{- block "main" . }}{{- end }} + diff --git a/static/css/index.css b/static/css/index.css index e74bf47..d944833 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -1,3 +1,18 @@ +@media (min-width: 50em) { + @font-face { + font-family: 'PT Sans'; + src: local("PT Sans"), local("PTSans-Regular"), url("../fonts/PTSans-Regular.woff") format("woff"); + font-weight: normal; + font-style: normal; + } + @font-face { + font-family: 'PT Sans'; + src: local("PT Sans Bold"), local("PTSans-Bold"), url("../fonts/PTSans-Bold.woff") format("woff"); + font-weight: bold; + font-style: normal; + } +} + @media (prefers-color-scheme: light) { html { background: #ffffff; @@ -27,6 +42,10 @@ body { -moz-osx-font-smoothing: grayscale; } +h1, h2, h3, h4, h5, h6 { + font-weight: 600; +} + b, strong, th { font-weight: 600; } @@ -117,6 +136,9 @@ body > header { flex-wrap: wrap; justify-content: space-between; align-items: center; + background: rgba(255, 255, 255, 0.02); + box-shadow: 0 0 .6em rgba(28, 29, 34, 0.05); + border-bottom: 1px solid rgba(142, 142, 145, 0.16); } body > header > a { @@ -141,18 +163,12 @@ nav a { margin: .4em .8em; } -body > header { - background: rgba(255, 255, 255, 0.02); - box-shadow: 0 0 .6em rgba(28, 29, 34, 0.05); - border-bottom: 1px solid rgba(142, 142, 145, 0.16); -} - -body > header, article { +body > header, body > article, body > footer { padding: 1.5em; } @media (min-width: 32em) { - body > header, article { + body > header, body > article, body > footer { padding: 1.5em calc(38% - 12em); } } diff --git a/static/css/sidebar.css b/static/css/sidebar.css index ad55dab..29591e3 100644 --- a/static/css/sidebar.css +++ b/static/css/sidebar.css @@ -1,9 +1,10 @@ body { font-size: 1.08em; margin-left: 16em; + overscroll-behavior: none; } -body > article { +body > article, body > footer { margin: 0 4em; padding: 2em 0; max-width: 55em; @@ -44,7 +45,7 @@ body > header > a { font-family: "PT Serif", Georgia; font-size: 2.2em; display: block; - margin: 0 0 1.5rem; + margin: 0 0 .8em; } article header h1 { diff --git a/static/fonts/PT-Sans.css b/static/fonts/PT-Sans.css deleted file mode 100644 index 2a034ed..0000000 --- a/static/fonts/PT-Sans.css +++ /dev/null @@ -1,13 +0,0 @@ -@font-face { - font-family: 'PT Sans'; - src: local('PT Sans'), local('PTSans-Regular'), url('PTSans-Regular.woff') format('woff'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'PT Sans'; - src: local('PT Sans Bold'), local('PTSans-Bold'), url('PTSans-Bold.woff') format('woff'); - font-weight: bold; - font-style: normal; -} \ No newline at end of file