mitri4
/
proekton.com
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR-55 Подвал, форма нового заказа и кнопки на главной

Browse Source 
Поправлены съехавшие Подвалы
В форме нового заказа поправлен отступ линии от кнопки дополнительных параметров
На главной поднять кнопки на 15 пикселей
remotes/origin/HEAD
booblegum 9 years ago
parent 2395f6dce2
commit 7a72069084
10 changed files with 35 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      assets/css/main.css
  2. 1
      assets/sass/components/custom-components.sass
  3. 1
      assets/sass/old_main.sass
  4. 38
      projects/templates/project_filter.html
  5. 12
      templates/home.html
  6. 3
      templates/partials/sass/home.sass
  7. 2
      users/templates/contractor_filter.html
  8. 6
      users/templates/contractor_office.html
  9. 3
      users/templates/contractor_office_chat_projects.html
  10. 3
      users/templates/contractor_office_open_projects.html

3
assets/css/main.css
Unescape View File

@ -34,6 +34,9 @@ body, html {
height: 100%;
position: relative;
}
.fix-footer footer.row {
margin-left: 0
}
/*input[type=checkbox], input[type=radio] {
opacity: 0; / * Блядь, какого ХУЯ????? * /

1
assets/sass/components/custom-components.sass
Unescape View File

@ -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

1
assets/sass/old_main.sass
Unescape View File

@ -320,6 +320,7 @@
.mainScore
position: relative
> .row
padding: 0 15px
border-right: 1px solid #CFCFCF
border-left: 1px solid #CFCFCF

38
projects/templates/project_filter.html
Unescape View File

@ -1,38 +1,32 @@
{% extends 'partials/base.html' %}
{% extends 'partials/_base.html' %}
{% load staticfiles %}
{% load sass_tags %}
{% block head_css %}
{# <link rel='stylesheet' href='{% static "lib/proekton-components/css/fonts.css" %}'>#}
{# <link rel='stylesheet' href='{% static "lib/proekton-components/css/selected-container.css" %}'>#}
{# <link rel='stylesheet' href='{% static "lib/proekton-components/css/editable-container.css" %}'>#}
{# <link rel='stylesheet' href='{% static "lib/proekton-components/css/select-box.css" %}'>#}
{% block personal_css %}
<link rel='stylesheet' href='{% sass_src "sass/old_main.sass" %}'>
<link rel='stylesheet' href='{% sass_src "lib/proekton-components/sass/components.sass" %}'>
<link rel='stylesheet' href='{% static "css/project_filter.css" %}'>{# other #}
<link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'>
{% endblock %}
{% block content %}
{% include 'partials/header.html' %}
<div class="container mainScore ">
<div class=" ">
<div class="col-lg-12 ">
<p class="titleScore">Поиск заказов</p>
</div>
{# FILTER#}
{% include 'partials/inc-projects-filter.html' %}
<div class="col-lg-12 ">
<div id="projectsBlock">
{% include 'partials/inc-projects-results.html' %}
<div class="old-main">
<div class="container mainScore ">
<div class="row">
<div class="col-lg-12 ">
<p class="titleScore">Поиск заказов</p>
</div>
{# FILTER#}
{% include 'partials/inc-projects-filter.html' %}
{% include 'partials/footer.html' %}
<div class="col-lg-12 ">
<div id="projectsBlock">
{% include 'partials/inc-projects-results.html' %}
</div>
</div>
</div>
</div>
</div>
{% endblock %}
{% block js_block %}
{{ block.super }}
{% block personal_js %}
<script src='{% static "lib/proekton-components/js/build/init.js" %}'></script>
<script src='{% static "js/build/project_filter.js" %}'></script>

12
templates/home.html
Unescape View File

@ -28,7 +28,6 @@
{% else %}
<a class="to-profile" href="{% url 'registration_register' %}?type=customer">Я заказчик</a>
{% endif %}
<p>
<ul class="customer-list">
<li>
<div class="icon-1"></div>
@ -68,20 +67,18 @@
</div>
</li>
</ul>
</p>
<a class="create" href="{% url 'projects:customer-project-create' %}">Разместить заказ</a>
</div>
</div>
<div class="col-lg-5 mod-no-padding">
<div class="infoBlock contractor">
{% if request.user.is_authenticated and request.user.is_contractor %}
<a class="to-profile" href="{% url 'users:contractor-profile' pk=request.user.pk %}">Я
исполнитель</a>
<a class="to-profile" href="{% url 'users:contractor-profile' pk=request.user.pk %}">
Я исполнитель</a>
{% else %}
<a class="to-profile" href="{% url 'registration_register' %}?type=contractor">Я
исполнитель</a>
<a class="to-profile" href="{% url 'registration_register' %}?type=contractor">
Я исполнитель</a>
{% endif %}
<p>
<ul class="contractor-list">
<li>
<div class="icon-7"></div>
@ -120,7 +117,6 @@
</div>
</li>
</ul>
</p>
<a class="create" href="{% url 'work_sell:create' %}">Разместить проект</a>
</div>
</div>

3
templates/partials/sass/home.sass
Unescape View File

@ -38,8 +38,7 @@
&.customer-list,
&.contractor-list
text-align: left
padding-left: 60px
padding-right: 20px
padding: 20px 20px 0 60px
li
display: flex
align-items: center

2
users/templates/contractor_filter.html
Unescape View File

@ -11,7 +11,7 @@
{% block content %}
<div class="old-main">
<div class="container mainScore ">
<div class="row" style="padding: 0 15px">
<div class="row">
<div class="col-lg-12 ">
<p class="titleScore">Поиск Исполнителей</p>
</div>

6
users/templates/contractor_office.html
Unescape View File

@ -291,8 +291,10 @@
</div>
</div>
{% endif %}
{% include 'partials/footer.html' %}
{# Нужно больше КОСТЫЛЕЙ!!! #}
<div class="fix-footer">
{% include 'partials/footer.html' %}
</div>
</div>
</div>
{% endblock %}

3
users/templates/contractor_office_chat_projects.html
Unescape View File

@ -129,8 +129,9 @@
{% include 'order_info.html' %}
</div>
<div class="fix-footer">
{% include 'partials/footer.html' %}
</div>
</div>
</div>
{% endblock %}

3
users/templates/contractor_office_open_projects.html
Unescape View File

@ -105,8 +105,9 @@
</div>
{% endfor %}
</div>
<div class="fix-footer">
{% include 'partials/footer.html' %}
</div>
</div>
</div>
{% endblock %}

Write Preview
Loading…
Cancel
Save