Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Bryan BRANCOTTE
django-basetheme-bootstrap
Commits
69ce4186
Commit
69ce4186
authored
Sep 04, 2019
by
Bryan BRANCOTTE
Browse files
avoiding css file collision, including fonts folders explicitly
parent
8d99079c
Pipeline
#14296
passed with stage
in 25 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
basetheme_bootstrap/static/css/fonts.css
→
basetheme_bootstrap/static/css/
basetheme_bootstrap4_pasteur_
fonts.css
View file @
69ce4186
File moved
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
=
[
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment