avoiding css file collision, including fonts folders explicitly

69ce4186 · Bryan BRANCOTTE · 8d99079c · 69ce4186 · 69ce4186 · 69ce4186
Commit 69ce4186 authored 5 years ago by Bryan BRANCOTTE
--- a/basetheme_bootstrap/static/css/fonts.css
+++ b/basetheme_bootstrap/static/css/fonts.css
--- a/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
+++ b/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
@@ -20,7 +20,7 @@
          href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-slider/10.0.0/css/bootstrap-slider.min.css"/>
    <link rel="stylesheet" href="{% sstatic '/css/bootstrap-multiselect.css' %}" type="text/css"/>
    <link rel="stylesheet" href="{% sstatic '/css/basetheme_bootstrap4_pasteur.css' %}"/>
-    <link rel="stylesheet" href="{% sstatic '/css/fonts.css' %}"/>
+    <link rel="stylesheet" href="{% sstatic '/css/basetheme_bootstrap4_pasteur_fonts.css' %}"/>
    {% block extra_css %}{% endblock %}
 </head>
 <body class="d-flex flex-column h-100">

--- a/setup.py
+++ b/setup.py
@@ -24,8 +24,12 @@ setup(
        "templates/basetheme_bootstrap/*",
        "templates/registration/*",
        "templates/*",
-        "static/fonts/*",
        "static/css/*",
+        "static/fonts/brandon_bld/*",
+        "static/fonts/brandon_blk/*",
+        "static/fonts/brandon_reg/*",
+        "static/fonts/playfairdisplay/*",
+        "static/fonts/Raleway/*",
        "static/js/*",
    ]},
    classifiers=[