diff --git a/assets/sass/components/custom-components.sass b/assets/sass/components/custom-components.sass index c465fa1..a661d75 100644 --- a/assets/sass/components/custom-components.sass +++ b/assets/sass/components/custom-components.sass @@ -194,6 +194,7 @@ textarea.description font-size: 16px border-radius: 50% margin-left: 25px + margin-right: 25px -webkit-transition: all 0.3s ease-out -moz-transition: all 0.3s ease-out transition: all 0.3s ease-out diff --git a/assets/sass/old_main.sass b/assets/sass/old_main.sass index 55e381e..44d0752 100644 --- a/assets/sass/old_main.sass +++ b/assets/sass/old_main.sass @@ -320,6 +320,7 @@ .mainScore position: relative > .row + padding: 0 15px border-right: 1px solid #CFCFCF border-left: 1px solid #CFCFCF diff --git a/projects/templates/project_filter.html b/projects/templates/project_filter.html index 938f856..9eded84 100644 --- a/projects/templates/project_filter.html +++ b/projects/templates/project_filter.html @@ -1,38 +1,32 @@ -{% extends 'partials/base.html' %} +{% extends 'partials/_base.html' %} {% load staticfiles %} {% load sass_tags %} -{% block head_css %} -{# #} -{# #} -{# #} -{# #} +{% block personal_css %} + {# other #} {% endblock %} {% block content %} - {% include 'partials/header.html' %} - -
-
-
-

Поиск заказов

-
- {# FILTER#} - {% include 'partials/inc-projects-filter.html' %} - -
-
- {% include 'partials/inc-projects-results.html' %} +
+
+
+
+

Поиск заказов

+ {# FILTER#} + {% include 'partials/inc-projects-filter.html' %} - {% include 'partials/footer.html' %} +
+
+ {% include 'partials/inc-projects-results.html' %} +
+
{% endblock %} -{% block js_block %} - {{ block.super }} +{% block personal_js %} diff --git a/templates/home.html b/templates/home.html index 1ec8623..8ae976c 100644 --- a/templates/home.html +++ b/templates/home.html @@ -28,7 +28,6 @@ {% else %} Я заказчик {% endif %} -

  • @@ -68,20 +67,18 @@
-

Разместить заказ
{% if request.user.is_authenticated and request.user.is_contractor %} - Я - исполнитель + + Я исполнитель {% else %} - Я - исполнитель + + Я исполнитель {% endif %} -

  • @@ -120,7 +117,6 @@
-

Разместить проект
diff --git a/templates/partials/sass/home.sass b/templates/partials/sass/home.sass index 945575e..e1edad1 100644 --- a/templates/partials/sass/home.sass +++ b/templates/partials/sass/home.sass @@ -38,8 +38,9 @@ &.customer-list, &.contractor-list text-align: left - padding-left: 60px - padding-right: 20px + //padding-left: 60px + //padding-right: 20px + padding: 20px 20px 0 60px li display: flex align-items: center diff --git a/users/templates/contractor_filter.html b/users/templates/contractor_filter.html index 3b9e68d..1354799 100644 --- a/users/templates/contractor_filter.html +++ b/users/templates/contractor_filter.html @@ -11,7 +11,7 @@ {% block content %}
-
+

Поиск Исполнителей

diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index fb02c5f..c0c5cb5 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -1,303 +1,315 @@ -{% extends 'partials/base.html' %} +{% extends 'partials/_base.html' %} {% load specializtions_tags %} {% load thumbnail %} {% load user_tags %} +{% load sass_tags %} + +{% block personal_css %} + +{% endblock %} {% block content %} - {% include 'partials/modals/add_team_member.html' %} - {% include 'partials/header.html' %} -
-
-
-

Личный кабинет

-
+ {% include 'partials/modals/add_team_member.html' %} - {% include 'partials/contractor_profile_tabs.html' %} - -
-
- {% if contractor.team %} - - {{ contractor.team.name }} - {% get_new_count_message contractor.team request.user %} - - {% else %} - - {% endif %} +
+
+
+
+

Личный кабинет

-
- {% for team in contractor.teams.all %} - - {{ team.name }} - {% get_new_count_message team request.user %} - - {% endfor %} -
+ {% include 'partials/contractor_profile_tabs.html' %} + +
+
+ {% if contractor.team %} + + {{ contractor.team.name }} + {% get_new_count_message contractor.team request.user %} + + {% else %} + + {% endif %} +
-