archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into wip-flask-one

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-08-30 10:59:00 +02:00
commit 82aa521b5f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/tests/config_testing.py
View File

@ -44,3 +44,5 @@ ELASTIC_INDICES = {
# MUST be 8 characters long, see pillar.flask_extra.HashedPathConverter # MUST be 8 characters long, see pillar.flask_extra.HashedPathConverter
STATIC_FILE_HASH = 'abcd1234' STATIC_FILE_HASH = 'abcd1234'
CACHE_NO_NULL_WARNING = True

6
src/styles/font-pillar.sass
View File

@ -1,7 +1,9 @@
/* So it's possible to override the path before importing font-pillar.sass */
$pillar-font-path: "../font" !default
@font-face @font-face
font-family: 'pillar-font' font-family: 'pillar-font'
src: url('../font/pillar-font.eot?55726379') src: url('#{$pillar-font-path}/pillar-font.woff?55726379') format("woff"), url('#{$pillar-font-path}/pillar-font.woff2?55726379') format("woff2")
src: url('../font/pillar-font.eot?55726379#iefix') format("embedded-opentype"), url('../font/pillar-font.woff2?55726379') format("woff2"), url('../font/pillar-font.woff?55726379') format("woff")
font-weight: normal font-weight: normal
font-style: normal font-style: normal