diff --git a/assets/css/main.css b/assets/css/main.css index 35834f1..ed7a9fe 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -6050,7 +6050,7 @@ a.linkS2[data-target="#withdraw-money"]{ .addWork { font-style: italic; padding: 17px 23px 17px 48px; - margin-top: 20px; + /*margin-top: 20px;*/ margin-left: 0; border-radius: 50px; border: 1px solid #42B476; diff --git a/assets/img/social/fb.png b/assets/img/social/fb.png new file mode 100644 index 0000000..9fe9193 Binary files /dev/null and b/assets/img/social/fb.png differ diff --git a/assets/img/social/gplus.png b/assets/img/social/gplus.png new file mode 100644 index 0000000..b01fba6 Binary files /dev/null and b/assets/img/social/gplus.png differ diff --git a/assets/img/social/ok.gif b/assets/img/social/ok.gif new file mode 100644 index 0000000..1ed767f Binary files /dev/null and b/assets/img/social/ok.gif differ diff --git a/assets/img/social/tw.png b/assets/img/social/tw.png new file mode 100644 index 0000000..f9a545f Binary files /dev/null and b/assets/img/social/tw.png differ diff --git a/assets/img/social/vk.png b/assets/img/social/vk.png new file mode 100644 index 0000000..39c8318 Binary files /dev/null and b/assets/img/social/vk.png differ diff --git a/assets/img/social/yt.png b/assets/img/social/yt.png new file mode 100644 index 0000000..65a6053 Binary files /dev/null and b/assets/img/social/yt.png differ diff --git a/templates/registration/login.html b/templates/registration/login.html index 78a046a..5943deb 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -1,81 +1,48 @@ {% extends 'partials/base.html' %} {% block content %} - {% include 'partials/header.html' %} -
-
-
+ {% include 'partials/header.html' %} +
+
+

Вход на сайт

-
-
+
+
{% csrf_token %} - {{ form.non_field_errors }} -
- - {{ form.username.errors }} -
-
- + {{ form.non_field_errors }} +
+ + {{ form.username.errors }} +
+
+ {{ form.password.errors }} +
+
+
+ +

Запомнить

+

Забыли пароль ?

-
-
- -

Запомнить

-

Забыли пароль ?

-
-
- -
-
-
- -
- - fb - -
- -
- - tw - -
+
-
- - gplus - -
+ {% include 'registration/social.html' %} -
- - vk - -
- -
- - yt - -
- -
-
-
- -
- -
+
+ +
+
+ {% include 'partials/footer.html' %}
- {% include 'partials/footer.html' %} -
-
+
{% endblock %} diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index b56312e..41428ef 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -9,7 +9,7 @@
{% csrf_token %} {{ form.non_field_errors }} - + {% if not hide_user_type %}
{# {% if request.GET.type == 'customer' %}#} @@ -23,12 +23,12 @@ {# {% endfor %}#} {# #} {# {% endif %}#} - + {{ form.user_type }} {{ form.user_type.errors }}
{% endif %} - +
@@ -60,49 +60,8 @@
-
-
-
- -
- - fb - -
- -
- - tw - -
- -
- - gplus - -
+ {% include 'registration/social.html' %} -
- - vk - -
- -{#
#} -{# #} -{# vk#} -{# #} -{#
#} - -
- - yt - -
- -
-
-
diff --git a/templates/registration/social.html b/templates/registration/social.html new file mode 100644 index 0000000..ec8d509 --- /dev/null +++ b/templates/registration/social.html @@ -0,0 +1,38 @@ +{% load static %} +
+
+
+ +
+ + fb + +
+ +
+ + tw + +
+ +
+ + gplus + +
+ +
+ + vk + +
+ +
+ + yt + +
+ +
+
+
\ No newline at end of file