Skip to content

Commit dcfe0da

Browse files
authored
Merge pull request #14 from simple-repository/feature/static-files-at-runtime
Ensure fontawesome is working, and guarantee its existence in all templates
2 parents d43b658 + 1153153 commit dcfe0da

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

javascript/package.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,9 @@
55
"main": "index.js",
66
"scripts": {
77
"build": "mkdir -p ../simple_repository_browser/static/vendored; npm run -s build-bootstrap; npm run -s build-jquery; npm run -s build-fontawesome; npm run -s build-popper.js; npm run -s build-custom-bootstrap",
8-
"build-bootstrap": "npm run -s build-bootstrap-js && npm run -s build-bootstrap-css",
9-
"build-bootstrap-js": "cp node_modules/bootstrap/dist/js/bootstrap.bundle.min.js* ../simple_repository_browser/static/vendored/",
10-
"build.bootstrap-css": "cp node_modules/bootstrap/dist/css/bootstrap.min.css ../simple_repository_browser/static/vendored/",
8+
"build-bootstrap": "cp node_modules/bootstrap/dist/js/bootstrap.bundle.min.js* ../simple_repository_browser/static/vendored/",
119
"build-jquery": "cp node_modules/jquery/dist/jquery.min.js ../simple_repository_browser/static/vendored/",
12-
"build-fontawesome": "npm run -s build-fontawesome-core && npm run -s build-fontawesome-solid && npm run -s build-fontawesome-regular",
13-
"build-fontawesome-core": "cp node_modules/@fortawesome/fontawesome-free/js/fontawesome.min.js ../simple_repository_browser/static/vendored/",
14-
"build-fontawesome-solid": "cp node_modules/@fortawesome/fontawesome-free/js/solid.min.js ../simple_repository_browser/static/vendored/",
15-
"build-fontawesome-regular": "cp node_modules/@fortawesome/fontawesome-free/js/regular.min.js ../simple_repository_browser/static/vendored/",
10+
"build-fontawesome": "cp node_modules//@fortawesome/fontawesome-free/js/all.min.js ../simple_repository_browser/static/vendored/fontawesome-free.all.min.js",
1611
"build-popper.js": "cp node_modules/popper.js/dist/umd/popper.min.js ../simple_repository_browser/static/vendored/",
1712
"build-custom-bootstrap": "webpack"
1813
},

simple_repository_browser/templates/base/base.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
<p></p>
6464
</div>
6565
{% block extra_footer %}
66+
{# Fontawesome can be used in all templates. #}
67+
<script src="{{ static_file_url('/vendored/fontawesome-free.all.min.js') }}" defer></script>
6668
{% endblock extra_footer %}
6769
</footer>
6870
{% endblock body %}

simple_repository_browser/templates/base/project.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,4 +436,5 @@ <h3>
436436
});
437437
});
438438
</script>
439+
{{ super() }}
439440
{% endblock extra_footer %}

0 commit comments

Comments
 (0)