Merge remote-tracking branch 'Knepherbird/master' into master

# Conflicts:
#	cps/jinjia.py
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/web.py
This commit is contained in:
Ozzieisaacs
2020-10-10 12:47:49 +02:00
9 changed files with 87 additions and 1 deletions
+6
View File
@@ -143,6 +143,12 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d
color: #444;
}
.container-fluid .book .meta .series {
font-weight: 400;
font-size: 12px;
color: #444;
}
.container-fluid .book .meta .author {
font-size: 12px;
color: #999;