From: Radek Czajka Date: Wed, 9 Sep 2020 13:21:52 +0000 (+0200) Subject: Fixes #4098: Missing Georgia font breaks leayout. X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/e5d57128eefe920b64600c33587de0ef1a51d97d?ds=inline Fixes #4098: Missing Georgia font breaks leayout. --- diff --git a/src/wolnelektury/static/css/master.book.css b/src/wolnelektury/static/css/master.book.css index c430a69f5..3a2eda503 100644 --- a/src/wolnelektury/static/css/master.book.css +++ b/src/wolnelektury/static/css/master.book.css @@ -1,6 +1,8 @@ +@import url('https://fonts.googleapis.com/css2?family=Gelasio:ital,wght@0,400;0,700;1,400;1,700&display=swap'); + body { font-size: 16px; - font-family: Georgia, "Times New Roman", serif; + font-family: Gelasio, Georgia, "Times New Roman", serif; line-height: 1.5em; margin: 0; } diff --git a/src/wolnelektury/static/css/new.book.css b/src/wolnelektury/static/css/new.book.css index 2208cd342..e3ad09193 100644 --- a/src/wolnelektury/static/css/new.book.css +++ b/src/wolnelektury/static/css/new.book.css @@ -1,6 +1,8 @@ +@import url('https://fonts.googleapis.com/css2?family=Gelasio:ital,wght@0,400;0,700;1,400;1,700&display=swap'); + body { font-size: 16px; - font-family: Georgia, "Times New Roman", serif; + font-family: Gelasio, Georgia, "Times New Roman", serif; line-height: 1.5em; margin: 0; } diff --git a/src/wolnelektury/static/scss/main/base.scss b/src/wolnelektury/static/scss/main/base.scss index 0c8dc8973..20b0a3544 100644 --- a/src/wolnelektury/static/scss/main/base.scss +++ b/src/wolnelektury/static/scss/main/base.scss @@ -14,7 +14,7 @@ html, body { /* Basic colors and fonts */ body { - font-family: Georgia, serif; + font-family: Gelasio, Georgia, serif; background: #f7f7f7; color: black; diff --git a/src/wolnelektury/static/scss/main/fonts.scss b/src/wolnelektury/static/scss/main/fonts.scss index 20abbb66e..03cf19a7d 100644 --- a/src/wolnelektury/static/scss/main/fonts.scss +++ b/src/wolnelektury/static/scss/main/fonts.scss @@ -141,3 +141,6 @@ src: local('Cousine Bold Italic'), local('Cousine-BoldItalic'), url(/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZegdm0LZdjqr5-oayXSOefg.woff2) format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } + + +@import url('https://fonts.googleapis.com/css2?family=Gelasio:ital,wght@0,400;0,700;1,400;1,700&display=swap'); diff --git a/src/wolnelektury/static/scss/main/header.scss b/src/wolnelektury/static/scss/main/header.scss index 9e6bb6b13..c8adda56f 100644 --- a/src/wolnelektury/static/scss/main/header.scss +++ b/src/wolnelektury/static/scss/main/header.scss @@ -246,24 +246,24 @@ header#main { @include size(border-radius, 5px); @include box-shadow(0 0 6.5px #444444 inset); - font-family: Georgia, serif; + font-family: Gelasio, Georgia, serif; @include size(font-size, 13px); background-color: white; color: black; /* styling search placeholder */ &::placeholder { - font-family: Georgia, serif; + font-family: Gelasio, Georgia, serif; font-style: italic; color: #767676; } &::-webkit-input-placeholder { - font-family: Georgia, serif; + font-family: Gelasio, Georgia, serif; font-style: italic; color: #767676; } &::-moz-placeholder { - font-family: Georgia, serif; + font-family: Gelasio, Georgia, serif; font-style: italic; color: #767676; } diff --git a/src/wolnelektury/static/scss/main/search.scss b/src/wolnelektury/static/scss/main/search.scss index 5e14505ee..3d992b368 100644 --- a/src/wolnelektury/static/scss/main/search.scss +++ b/src/wolnelektury/static/scss/main/search.scss @@ -5,7 +5,7 @@ } .ui-widget { - font-family: Georgia !important; + font-family: Gelasio, Georgia, serif !important; @include size(font-size, 10px !important); }