Skip to content

GitLab

D
django-basetheme-bootstrap
Commit 69ce4186 authored by Bryan BRANCOTTE's avatar Bryan BRANCOTTE
Browse files
Options

avoiding css file collision, including fonts folders explicitly

parent 8d99079c
Pipeline #14296 passed with stage
    in 25 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 6 additions and 2 deletions
    basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
    View file @ 69ce4186
    ......@@ -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">
    ......
    setup.py
    View file @ 69ce4186
    ......@@ -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=[
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment