diff --git a/assets/css/bootstrap.css b/assets/css/bootstrap.css index b561aab..2dec3e0 100644 --- a/assets/css/bootstrap.css +++ b/assets/css/bootstrap.css @@ -3610,13 +3610,13 @@ tbody.collapse.in { right: 0; left: auto; } -.dropup .caret, +/*.dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px dashed; border-bottom: 4px solid \9; content: ""; -} +}*/ .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; diff --git a/assets/css/main.css b/assets/css/main.css index c27aa5a..d3f2763 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1115,7 +1115,7 @@ footer:after { } .titleF1 { - margin: 0 0 23px 0; + margin: 23px 0 0 0; } .titleF1, .polsF1, .searchF1, .resSearchF1, .sro { @@ -1133,7 +1133,7 @@ footer:after { .polsF1 .btn-group .btn { width: 100% !important; - padding: 15px 105px 15px 18px; + padding: 15px 30px 15px 18px; border-radius: 0 !important; border: none; font-size: 15px; @@ -1204,11 +1204,12 @@ footer:after { color: #FF0029; } -.polsF1 .dropdown-menu { +.polsF1 .dropdown-menu.open { width: 100%; - margin-top: 2px; + margin:0 !important; + padding: 0 !important; border-radius: 0 !important; - outline: 1px solid #FF0029; + outline: 2px solid #FF0029; } .bootstrap-select.btn-group .dropdown-menu { @@ -1219,9 +1220,9 @@ footer:after { margin-bottom: 0; } -.polsF1 .dropdown-menu li:first-child { +/*.polsF1 .dropdown-menu li:first-child { margin-top: -6px; -} +}*/ .polsF1 .dropdown-menu li:last-child { margin-bottom: 2px; @@ -1314,7 +1315,7 @@ footer:after { margin: 30px 0 23px 0; } -.titleResF1 { +.titleResF1, div p.titleResF1 { font-size: 15px; font-family: 'Arial-MT-Regular', sans-serif; font-weight: bold; @@ -5440,7 +5441,7 @@ input[type="radio"]:checked + span { position: absolute; font-family: 'Glyphicons Halflings'; right: -6.5px; - top: -21px; + top: -19px; font-size: 12px; } @@ -5483,3 +5484,223 @@ input[type="radio"]:checked + span { } } +/*my_new_style*/ +.proj_answ_form .textAreaBlock2 p { + font-size: 15px; + font-weight: bold; + display: table; + width: auto; + margin-top: 13px; +} +.polsF1 .dropdown-menu.open a{ + border: none; + border-radius: 0; + margin-bottom: 0; +} +.proj_answ_form .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn){ + width: 121px !important; + border: 1px solid #cdcdcd; +} +.proj_answ_form .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) .btn{ + padding: 14px 30px 14px 18px; +} +.proj_answ_form .textAreaBlock2 input{ + width: 90px; + height: 51px; + padding: 0 15px; + font-size: 15px; + background-color: white; + color: #9c9c9c; + float: left; + margin-right: 26px; + font-family: 'Arial-MT-Regular', sans-serif; +} +.proj_answ_form .textAreaBlock2 input[type="text"] { + margin-left: 10px; + width: 216px; +} +.proj_answ_form .textAreaBlock2 input[name="term"]{ + width: 262px; +} +.proj_answ_form .textAreaBlock2 p span{ + position: absolute; + bottom: 13px; + font-size: 12px; + font-weight: normal; +} +.port_add_bl ul li{ + width: 20%; + display: table; + float: left; + padding-right: 10px; +} +.port_add_bl ul { + margin-top: 15px; + padding: 0 15px; +} +.port_add_bl label{ + margin-right: 5px; +} +.port_add_bl > p:first-child{ + font-size: 15px; + font-weight: bold; + padding: 0 15px; +} +#fileUploadContainer div button, .proj_answ_form .send_req_block button{ + border-radius: 40px; + font-family: 'pfdintextcomppro-regular', sans-serif; + letter-spacing: 2px; + color: #373737; + font-size: 15px; + border: 1px solid #BEBEBE; + padding: 17px 46px; + text-transform: uppercase; + outline: none; +} +#fileUploadContainer, .proj_answ_form .check_bs, .proj_answ_form .send_req_block{ + padding: 0 15px; +} +.proj_answ_form .check_bs label{ + margin-right: 5px; +} +.dashedCol4 { + width: 254px; + height: 239px; + position: absolute; + overflow: hidden; + display: block; + background-color: #fff; +} +.dashedCol4:after { + content: ""; + position: absolute; + height: 50px; + width: 100%; + background: #fff; + bottom: 0; + right: 0; +} +.dashedCol4:hover{ + box-shadow: 0 0 10px rgba(0,0,0,0.8); + z-index: 999; + display: table; +} +.insetSpec span:first-child{ + width: 75%; +} +.select2-container .select2-choice { + border-radius: 0 !important; + border: 1px solid #ccc; + background: #fff !important; + height: 50px; + font-size: 15px; + color: #2c2c2c; + position: relative; + font-family: 'Arial-MT-Regular', sans-serif; + background-color: white; +} +.select2-container .select2-choice .select2-arrow{ + background: #fff; + border: none; +} +.select2-container .select2-choice .select2-arrow b{ + position: relative; + top: 9px; +} +.select2-container .select2-choice > .select2-chosen { + margin-right: 6px; + line-height: 47px; +} +.select2-results .select2-result-label{ + font-size: 15px; + font-family: 'Arial-MT-Regular', sans-serif; + padding-top: 10px; + padding-bottom: 10px; + display: block; + padding: 9px 8px; + clear: both; + background: #fff; + font-weight: normal; + line-height: 1.42857143; + color: #333333; + white-space: nowrap; +} +.select2-results .select2-result-label:hover{ + background-color: #f2f2f2; +} +.select2-display-none{ + border: 1px solid #aaa; +} +.select2-container .select2-choice abbr{ + right: 3px; + top: 16px; +} +#portfolio-add-form .textAreaBlock2 p{ + font-size: 15px; + font-family: 'Arial-MT-Regular', sans-serif; + font-weight: bold; + color: #2c2c2c; +} +#portfolio-add-form #text-new{ + margin-top: 0; +} +.textAreaBlock2 input{ + width: 100%; + height: 51px; + padding: 0 15px; + font-size: 15px; + background-color: white; + color: #9c9c9c; + font-family: 'Arial-MT-Regular', sans-serif; +} +#portfolio-add-form .polsF1 .btn{ + border:1px solid #c2c2c2; +} +#portfolio-add-form .bootstrap-select{ + width: 100% !important; +} +.textAreaBlock2 .add_file_to_port{ + border-radius: 40px; + font-family: 'pfdintextcomppro-regular', sans-serif; + letter-spacing: 2px; + color: #373737; + background-color: #fff; + font-size: 15px; + border: 1px solid #BEBEBE; + padding: 17px 46px; + text-transform: uppercase; + outline: none; + display: table; + float: left; + width: auto; +} +.textAreaBlock2 .add_file_to_port:hover{ + color: #373737; + background-color: #f2f2f2 !important; +} +.progress-bar-success { + background-color: #c2c2c2; +} +.bootstrap-select.btn-group .dropdown-menu li { + position: relative; + float: left; + width: 100%; +} +#order-stages label{ + margin-bottom: 0; + margin-top: 8px; +} +#order-stages .checkbox label{ + margin-top: 0; +} +#order-stages > div { + display: table; + width: 100%; + padding-bottom: 14px; + border-bottom: 1px solid #2c2c2c; + margin-bottom: 14px; +} +#order-stages > div:nth-last-child(2), #order-stages > div:last-child{ + border: none; +} +/*end_new*/ \ No newline at end of file diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html index ebc9156..84f99e9 100644 --- a/chat/templates/chat_customer.html +++ b/chat/templates/chat_customer.html @@ -24,7 +24,7 @@
- +
@@ -86,9 +86,9 @@
- + - +
@@ -142,8 +142,8 @@ Обсуджение задания и условий выполнения работы. Подтверждение заказа исполнителем.

- -
+ +

2 / Резервирование

@@ -153,41 +153,40 @@

- Зарезирвировать -
+ Зарезирвировать +
-
+
-
@@ -455,6 +450,7 @@ getStages(orderId); }); + // Вытащить сообщения для конактов $('.user-block').on('click', function () { var userId = $(this).attr('data-id'); @@ -537,7 +533,6 @@ }); - var userId = '{{ request.user.pk }}'; var SocketHandler = function () { var domain = '{{ request.META.HTTP_HOST }}'; diff --git a/specializations/templates/templatetags/specializations_widget.html b/specializations/templates/templatetags/specializations_widget.html new file mode 100644 index 0000000..d2aaed3 --- /dev/null +++ b/specializations/templates/templatetags/specializations_widget.html @@ -0,0 +1,23 @@ +
+

Специализации:

+
+ {% for spec in specializations %} +
+ {{ spec }} + 2-й +
+ {% endfor %} +
+
+{#
#} +{#

#} +{# Специализации:#} +{#

#} +{#
#} +{# Интерьеры#} +{#
#} +{# #} +{#
#} +{# Визуализация/3D#} +{#
#} +{#
#} diff --git a/users/templates/portfolio_create_form.html b/users/templates/portfolio_create_form.html index 13af2c6..540351c 100644 --- a/users/templates/portfolio_create_form.html +++ b/users/templates/portfolio_create_form.html @@ -3,13 +3,13 @@
{% csrf_token %}
-

Название{{ portfolio_form.name.errors.as_text }}

+

Название{{ portfolio_form.name.errors.as_text }}

-

Описание{{ portfolio_form.description.errors.as_text }}

+

Описание{{ portfolio_form.description.errors.as_text }}

@@ -32,40 +32,49 @@
- - + + -
+

Бюджет{{ portfolio_form.budget.errors.as_text }}

-
+
{{ portfolio_form.currency}}
-
+

Срок выполнения{{ portfolio_form.budget.errors.as_text }}

-
+
{{ portfolio_form.term_type }}
-
+
-
-

Вид строительства

- {{ portfolio_form.construction_type}} -
+
+
+
+

Вид строительства

+ {{ portfolio_form.construction_type}} +
+
+

Классификация здания

+ {{ portfolio_form.building_classification}} +
+
+

Классификация здания

@@ -78,14 +87,18 @@ {{ portfolio_form.duplicate }} Дублировать проект в готовые работы
+
+ +
- - - Выберите файлы - - +
+ + Выберите файлы + + +


@@ -99,6 +112,20 @@
+ +
+
+
+
+
+ +
+
+
+
+ +
+