diff --git a/static/css/styles.css b/static/css/styles.css index 2d9f93c..66b0f8f 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -768,6 +768,10 @@ section.profile { flex-basis: 35px; } +.info_profile{ + width: clamp(400px, 827px, 900px) +} + .info_profile>h1 { color: #272424; font-family: Inter; @@ -910,11 +914,32 @@ form.new_route>div{ margin-bottom: 30px; margin-top: 30px; display: flex; + flex-direction: row; + flex-wrap: wrap; } + form.new_route{ width:100%; } +.departure_arrival>div, +.from_to_place>div, +.from_to_country>div +{ + display: flex; + flex-direction: column; + flex: 1; + margin-right: 20px; + +} -/*end create new route*/ \ No newline at end of file + +/*end create new route*/ + + +/*Range slider*/ + + + +/*Range slider end*/ \ No newline at end of file diff --git a/static/js/registration.js b/static/js/registration.js index e4d731d..d2a3418 100644 --- a/static/js/registration.js +++ b/static/js/registration.js @@ -23,3 +23,4 @@ function SendRegistrationForm(el){ }); } + diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html index fcfd235..134c9c4 100644 --- a/templates/blocks/profile/b_new_route.html +++ b/templates/blocks/profile/b_new_route.html @@ -1,7 +1,11 @@ +{% load static %} +
{% csrf_token %}
+
+
- + +
+
-
+ +
-
+
+
- +
+
+
{#
#} {# #} {# #} @@ -34,26 +43,31 @@ {# #} {# #} {#
#} -
+
+
- +
+
+

+
+
+

@@ -88,5 +102,5 @@
- + \ No newline at end of file diff --git a/templates/inter/meta.html b/templates/inter/meta.html index 8a5d5ba..683aec1 100644 --- a/templates/inter/meta.html +++ b/templates/inter/meta.html @@ -4,4 +4,6 @@ + + \ No newline at end of file diff --git a/templates/pages/p_main.html b/templates/pages/p_main.html index ad14e2a..28c2a8e 100644 --- a/templates/pages/p_main.html +++ b/templates/pages/p_main.html @@ -1,15 +1 @@ - - - - - Title - {% include 'inter/meta.html' %} - - -
- {% include 'blocks/b_header.html' %} - {% include 'blocks/b_footer.html' %} - -
- - \ No newline at end of file +{% extends 'tb_base.html' %} \ No newline at end of file diff --git a/templates/pages/profile/p_login.html b/templates/pages/profile/p_login.html index fd24ee1..f7ccb4f 100644 --- a/templates/pages/profile/p_login.html +++ b/templates/pages/profile/p_login.html @@ -1,16 +1,11 @@ - - - - - Title - {% include 'inter/meta.html' %} - - -
- {% include 'blocks/b_header.html' %} - {% include 'forms/f_login.html' %} - {% include 'blocks/b_footer.html' %} +{% extends 'tb_base.html' %} +{% load static %} -
- - \ No newline at end of file + +{% block meta %} + +{% endblock %} + +{% block content %} + {% include 'forms/f_login.html' %} +{% endblock %} \ No newline at end of file diff --git a/templates/pages/profile/p_registration.html b/templates/pages/profile/p_registration.html index 76f153b..d489e18 100644 --- a/templates/pages/profile/p_registration.html +++ b/templates/pages/profile/p_registration.html @@ -1,5 +1,9 @@ +{% extends 'tb_base.html' %} -{% include 'inter/meta.html' %} -{% include 'blocks/b_header.html' %} -{% include 'forms/f_registration.html' %} -{% include 'blocks/b_footer.html' %} \ No newline at end of file +{% block meta %} + +{% endblock %} + +{% block content %} + {% include 'forms/f_registration.html' %} +{% endblock %} \ No newline at end of file diff --git a/templates/pages/profile/p_user_profile.html b/templates/pages/profile/p_user_profile.html index 8ab36d7..2578ff1 100644 --- a/templates/pages/profile/p_user_profile.html +++ b/templates/pages/profile/p_user_profile.html @@ -1,4 +1,11 @@ -{% include 'inter/meta.html' %} -{% include 'blocks/b_header.html' %} -{% include 'blocks/b_user_profile.html' %} -{% include 'blocks/b_footer.html' %} \ No newline at end of file +{% extends 'tb_base.html' %} +{% load static %} + + +{% block meta %} + +{% endblock %} + +{% block content %} + {% include 'blocks/b_user_profile.html' %} +{% endblock %} \ No newline at end of file diff --git a/templates/tb_base.html b/templates/tb_base.html new file mode 100644 index 0000000..42165d1 --- /dev/null +++ b/templates/tb_base.html @@ -0,0 +1,27 @@ +{% load static %} + + + + + Title + + + + + + {% block meta %} +{# {% include 'inter/meta.html' %}#} + {% endblock %} + + +
+ {% include 'blocks/b_header.html' %} + + {% block content %} + {% endblock %} + + {% include 'blocks/b_footer.html' %} + +
+ + \ No newline at end of file