fnp
/
wolnelektury.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e5d5712
)
Imports at the start.
author
Radek Czajka
<rczajka@rczajka.pl>
Wed, 9 Sep 2020 19:44:09 +0000
(21:44 +0200)
committer
Radek Czajka
<rczajka@rczajka.pl>
Thu, 10 Sep 2020 12:15:11 +0000
(14:15 +0200)
src/wolnelektury/settings/static.py
patch
|
blob
|
history
src/wolnelektury/static/css/import/gelasio.css
[new file with mode: 0644]
patch
|
blob
src/wolnelektury/static/css/master.book.css
patch
|
blob
|
history
src/wolnelektury/static/css/new.book.css
patch
|
blob
|
history
src/wolnelektury/static/scss/main/fonts.scss
patch
|
blob
|
history
diff --git
a/src/wolnelektury/settings/static.py
b/src/wolnelektury/settings/static.py
index
bfffb82
..
2873410
100644
(file)
--- 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': [
'main': {
# styles both for mobile and for big screen
'source_filenames': [
+ 'css/import/gelasio.css',
+
'css/jquery.countdown.css',
'jplayer/jplayer.blue.monday.css',
'css/jquery.countdown.css',
'jplayer/jplayer.blue.monday.css',
@@
-42,12
+44,14
@@
PIPELINE = {
},
'book': {
'source_filenames': [
},
'book': {
'source_filenames': [
+ 'css/import/gelasio.css',
'css/master.book.css',
],
'output_filename': 'css/compressed/book.css',
},
'book_text': {
'source_filenames': [
'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',
'scss/book_text.scss',
'css/new.book.css',
'annoy/banner.scss',
@@
-65,6
+69,7
@@
PIPELINE = {
},
'picture': {
'source_filenames': [
},
'picture': {
'source_filenames': [
+ 'css/import/gelasio.css',
'css/master.book.css',
'css/master.picture.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
(file)
index 0000000..
63c9015
--- /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
3a2eda5
..
36cade8
100644
(file)
--- 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;
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
e3ad091
..
77f8197
100644
(file)
--- 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;
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
03cf19a
..
b1d6d59
100644
(file)
--- 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;
}
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');