From 5238e2c26d46dee3a82cdf89d3f916dda9fc10fb Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Wed, 22 Aug 2018 19:57:22 +0200 Subject: [PATCH 1/2] Pillar Font: Use variable for path --- src/styles/font-pillar.sass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/styles/font-pillar.sass b/src/styles/font-pillar.sass index 11cd3c06..905d5410 100644 --- a/src/styles/font-pillar.sass +++ b/src/styles/font-pillar.sass @@ -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-family: 'pillar-font' - src: url('../font/pillar-font.eot?55726379') - 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") + src: url('#{$pillar-font-path}/pillar-font.woff?55726379') format("woff"), url('#{$pillar-font-path}/pillar-font.woff2?55726379') format("woff2") font-weight: normal font-style: normal From 595bb4874120384183ae8dd9f7d2451148ab26a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 29 Aug 2018 15:23:34 +0200 Subject: [PATCH 2/2] Silence warning of Flask-Caching about NULL cache during testing --- pillar/tests/config_testing.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pillar/tests/config_testing.py b/pillar/tests/config_testing.py index 4c9d03a9..a3f601b9 100644 --- a/pillar/tests/config_testing.py +++ b/pillar/tests/config_testing.py @@ -44,3 +44,5 @@ ELASTIC_INDICES = { # MUST be 8 characters long, see pillar.flask_extra.HashedPathConverter STATIC_FILE_HASH = 'abcd1234' + +CACHE_NO_NULL_WARNING = True