Commit 69ce4186 authored by Bryan  BRANCOTTE's avatar Bryan BRANCOTTE
Browse files

avoiding css file collision, including fonts folders explicitly

parent 8d99079c
Pipeline #14296 passed with stage
in 25 seconds
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-slider/10.0.0/css/bootstrap-slider.min.css"/> 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/bootstrap-multiselect.css' %}" type="text/css"/>
<link rel="stylesheet" href="{% sstatic '/css/basetheme_bootstrap4_pasteur.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 %} {% block extra_css %}{% endblock %}
</head> </head>
<body class="d-flex flex-column h-100"> <body class="d-flex flex-column h-100">
......
...@@ -24,8 +24,12 @@ setup( ...@@ -24,8 +24,12 @@ setup(
"templates/basetheme_bootstrap/*", "templates/basetheme_bootstrap/*",
"templates/registration/*", "templates/registration/*",
"templates/*", "templates/*",
"static/fonts/*",
"static/css/*", "static/css/*",
"static/fonts/brandon_bld/*",
"static/fonts/brandon_blk/*",
"static/fonts/brandon_reg/*",
"static/fonts/playfairdisplay/*",
"static/fonts/Raleway/*",
"static/js/*", "static/js/*",
]}, ]},
classifiers=[ classifiers=[
......
Supports Markdown
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