Skip to content

Commit

Permalink
Merge branch 'refs/heads/feature/sematic_dropdowns' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
henhuy committed Jun 6, 2024
2 parents 9f42cb1 + 5812938 commit fe15005
Show file tree
Hide file tree
Showing 27 changed files with 8,114 additions and 13 deletions.
8,094 changes: 8,088 additions & 6 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"dependencies": {
"bootstrap": "^5.3.2",
"datatables.net-dt": "^2.0.3",
"fomantic-ui": "^2.9.3",
"jquery": "^3.7.1"
}
}
11 changes: 11 additions & 0 deletions sedos_dashboard/static/vendors/fomantic-ui/semantic.min.css

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions sedos_dashboard/static/vendors/fomantic-ui/semantic.min.js

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 3 additions & 7 deletions sedos_dashboard/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@
<meta name="author" content="Hendrik Huyskens" />
<link rel="icon" href="{% static 'images/favicons/favicon.ico' %}" />
{% block css %}
<!-- Latest compiled and minified Bootstrap CSS -->
<!-- Your stuff: Third-party CSS libraries go here -->
<!-- This file stores project-specific CSS -->
{% compress css %}
<link rel="stylesheet" type="text/x-scss" href="{% static "vendors/bootstrap/scss/bootstrap.scss" %}" />
{# <link rel="stylesheet" href="{% static "vendors/bootstrap-select/css/bootstrap-select.min.css" %}" />#}
<link rel="stylesheet" type="text/css" href="{% static "vendors/fomantic-ui/semantic.min.css" %}" />
<link href="{% static 'css/project.css' %}" rel="stylesheet" />
{% endcompress %}
{% endblock css %}
Expand All @@ -32,9 +29,8 @@
{% block javascript %}
<!-- Bootstrap JS -->
<script defer src="{% static "vendors/bootstrap/js/bootstrap.min.js" %}"></script>
{# <script defer src="{% static "vendors/bootstrap-select/js/bootstrap-select.js" %}"></script>#}
<!-- Your stuff: Third-party javascript libraries go here -->
<!-- place project specific Javascript in this file -->
<script type="text/javascript" src="{% static "vendors/jquery/jquery.min.js" %}"></script>
<script defer type="text/javascript" src="{% static "vendors/fomantic-ui/semantic.min.js" %}"></script>
{% compress js %}
<script defer src="{% static 'js/project.js' %}"></script>
{% endcompress %}
Expand Down

0 comments on commit fe15005

Please sign in to comment.