From b6b103ddbc998e5d52439430b4eafe422133ed64 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 9 Sep 2020 21:44:09 +0200 Subject: [PATCH] Imports at the start. --- src/wolnelektury/settings/static.py | 5 +++++ src/wolnelektury/static/css/import/gelasio.css | 1 + src/wolnelektury/static/css/master.book.css | 2 -- src/wolnelektury/static/css/new.book.css | 2 -- src/wolnelektury/static/scss/main/fonts.scss | 2 -- 5 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 src/wolnelektury/static/css/import/gelasio.css diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py index bfffb820e..28734105a 100644 --- a/src/wolnelektury/settings/static.py +++ b/src/wolnelektury/settings/static.py @@ -25,6 +25,8 @@ PIPELINE = { 'main': { # styles both for mobile and for big screen 'source_filenames': [ + 'css/import/gelasio.css', + 'css/jquery.countdown.css', 'jplayer/jplayer.blue.monday.css', @@ -42,12 +44,14 @@ PIPELINE = { }, 'book': { 'source_filenames': [ + 'css/import/gelasio.css', 'css/master.book.css', ], 'output_filename': 'css/compressed/book.css', }, 'book_text': { 'source_filenames': [ + 'css/import/gelasio.css', 'scss/book_text.scss', 'css/new.book.css', 'annoy/banner.scss', @@ -65,6 +69,7 @@ PIPELINE = { }, 'picture': { 'source_filenames': [ + 'css/import/gelasio.css', 'css/master.book.css', 'css/master.picture.css', ], diff --git a/src/wolnelektury/static/css/import/gelasio.css b/src/wolnelektury/static/css/import/gelasio.css new file mode 100644 index 000000000..63c901598 --- /dev/null +++ b/src/wolnelektury/static/css/import/gelasio.css @@ -0,0 +1 @@ +@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/css/master.book.css b/src/wolnelektury/static/css/master.book.css index 3a2eda503..36cade8ec 100644 --- a/src/wolnelektury/static/css/master.book.css +++ b/src/wolnelektury/static/css/master.book.css @@ -1,5 +1,3 @@ -@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: Gelasio, Georgia, "Times New Roman", serif; diff --git a/src/wolnelektury/static/css/new.book.css b/src/wolnelektury/static/css/new.book.css index e3ad09193..77f819756 100644 --- a/src/wolnelektury/static/css/new.book.css +++ b/src/wolnelektury/static/css/new.book.css @@ -1,5 +1,3 @@ -@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: Gelasio, Georgia, "Times New Roman", serif; diff --git a/src/wolnelektury/static/scss/main/fonts.scss b/src/wolnelektury/static/scss/main/fonts.scss index 03cf19a7d..b1d6d59b0 100644 --- a/src/wolnelektury/static/scss/main/fonts.scss +++ b/src/wolnelektury/static/scss/main/fonts.scss @@ -142,5 +142,3 @@ 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'); -- 2.20.1