mam/mamweb
11
0
Fork 0
Code Issues Pull requests 8 Projects Wiki Activity Actions

Separace bootstrapu

Browse source
This commit is contained in:
Jonas Havelka 2024-02-12 18:55:41 +01:00
parent 239a324a19
commit b2911d5e9f
9 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
mamweb/static/css/bootstrap-theme.css → mamweb/static/bootstrap/css/bootstrap-theme.css vendored
View file

0
mamweb/static/css/bootstrap.css → mamweb/static/bootstrap/css/bootstrap.css vendored
View file

0
mamweb/static/fonts/glyphicons-halflings-regular.eot → mamweb/static/bootstrap/fonts/glyphicons-halflings-regular.eot
View file

0
mamweb/static/fonts/glyphicons-halflings-regular.svg → mamweb/static/bootstrap/fonts/glyphicons-halflings-regular.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

0
mamweb/static/fonts/glyphicons-halflings-regular.ttf → mamweb/static/bootstrap/fonts/glyphicons-halflings-regular.ttf
View file

0
mamweb/static/fonts/glyphicons-halflings-regular.woff → mamweb/static/bootstrap/fonts/glyphicons-halflings-regular.woff
View file

0
mamweb/static/js/bootstrap.js → mamweb/static/bootstrap/js/bootstrap.js vendored
View file

6
mamweb/templates/base.html
View file

@ -8,8 +8,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="{% static 'images/MATFYZ_MM_barevne.svg' %}" type="image/x-icon"> <link rel="shortcut icon" href="{% static 'images/MATFYZ_MM_barevne.svg' %}" type="image/x-icon">
{% block custom_css %}{% endblock %} {% block custom_css %}{% endblock %}
<link href="{% static 'css/bootstrap-theme.css' %}" rel="stylesheet"> <link href="{% static 'bootstrap/css/bootstrap-theme.css' %}" rel="stylesheet">
<link href="{% static 'css/bootstrap.css' %}" rel="stylesheet"> <link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet">
<link href="{% static 'css/mamweb.css' %}?version=1" rel="stylesheet"> <link href="{% static 'css/mamweb.css' %}?version=1" rel="stylesheet">
<link href="{% static 'css/prettyPhoto.css' %}" rel="stylesheet" type="text/css" media="screen" charset="utf-8" /> <link href="{% static 'css/prettyPhoto.css' %}" rel="stylesheet" type="text/css" media="screen" charset="utf-8" />
<script src="{% static 'js/jquery-1.11.1.js' %}"></script> <script src="{% static 'js/jquery-1.11.1.js' %}"></script>
@ -118,7 +118,7 @@
</div> <!-- container --> </div> <!-- container -->
<script src="{% static 'js/bootstrap.js' %}"></script> <script src="{% static 'bootstrap/js/bootstrap.js' %}"></script>
<script src="{% static 'js/jquery.jcarousel-core.js' %}" type="text/javascript"></script> <script src="{% static 'js/jquery.jcarousel-core.js' %}" type="text/javascript"></script>
<script src="{% static 'js/jquery.prettyPhoto.js' %}" type="text/javascript" charset="utf-8"></script> <script src="{% static 'js/jquery.prettyPhoto.js' %}" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">

1
requirements.txt
View file

@ -11,7 +11,6 @@ pilkit>=3.0 # Kvůli kompatibilitě s Pillow>=10.0.0
# Django and modules # Django and modules
Django<5.0 Django<5.0
#django-bootstrap-sass
django-reversion # Version control na datech v databázi django-reversion # Version control na datech v databázi
django-countries # Políčko ve formu / field v modelu ohledně států django-countries # Políčko ve formu / field v modelu ohledně států
django-solo # Singleton model (speciálně Nastavení) django-solo # Singleton model (speciálně Nastavení)