sysadminix/account_store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	static/js/user_profile.js
This commit is contained in:
borissedw
2023-10-27 17:21:28 +03:00
parent b8c282f95f 47e39a1d9c
commit cc86400957
8 changed files with 259 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
templates/tb_base.html
View File

@@ -34,8 +34,8 @@
<link rel="stylesheet" href="{% static 'css/styles.css' %}">
<link rel="stylesheet" href="{% static 'css/styles(boris).css' %}" >
<link rel="stylesheet" href="{% static 'css/mobile_styles.css' %}">
<script src='{% static "js/find_route.js" %}'></script>
<script src="{% static "js/filters_functions_find_route.js" %}"></script>
@@ -52,17 +52,17 @@
{% endblock %}
</head>
<body>
<div class="wrapper">
{# modifided by boris#}
<div class="header_big_background">
</div>
<div class="wrapper_main">
{% include 'blocks/b_header.html' %}
<div class="line_f_header"></div>
<div class="wrapper_content">
{% block content %}
{% endblock %}
{% block content %}
{% endblock %}
</div>
</div>
{% include 'blocks/b_footer.html' %}