diff --git a/Makefile b/Makefile index 5a3f292..c9b6bf9 100644 --- a/Makefile +++ b/Makefile @@ -44,15 +44,15 @@ with open(sys.argv[2], "w") as f: endef export PYTHON_MAKE_JINJA2_RENDERED_CARD -build/test_card_rendered.html: test_card.yaml style.html.j2 templates/card_header.html.j2 +build/test_card_rendered.html: test_card.yaml style.html.j2 build/style.css templates/card_header.html.j2 python3 -c "$$PYTHON_MAKE_JINJA2_RENDERED_CARD" "test_card.yaml" "build/test_card_rendered.html" export PYTHON_MAKE_JINJA2_RENDERED_CARD -cards/build/%.html: cards/%.yaml style.html.j2 templates/card_header.html.j2 +cards/build/%.html: cards/%.yaml style.html.j2 build/style.css templates/card_header.html.j2 python3 -c "$$PYTHON_MAKE_JINJA2_RENDERED_CARD" $< $@ export PYTHON_MAKE_JINJA2_RENDERED_CARD -cards/build/all.html: $(CARDS) style.html.j2 templates/card_header.html.j2 +cards/build/all.html: $(CARDS) style.html.j2 build/style.css templates/card_header.html.j2 python3 -c "$$PYTHON_MAKE_JINJA2_RENDERED_CARD" ALL $@ diff --git a/style.html.j2 b/style.html.j2 index 7af6d1e..31c4c37 100644 --- a/style.html.j2 +++ b/style.html.j2 @@ -29,28 +29,27 @@ {% elif figure.type == "svg" %} {# /cards/svg #} - {% if figure.color %} - {% if figure.color == true %} - - {% else %} - - {% endif %} + {% if figure.color == true %} + + {% elif figure.color %} + {% else %} - + {% endif %} {% elif figure.type == "img" %} {# /cards/img #} - {% if figure.color %} - + {% if figure.color == true %} + + {% elif figure.color %} + {% else %} - + {% endif %} - {% endif %} {% endmacro %} -