From f2c636b026f35933233b831d0c779b3cbc9713c3 Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Thu, 22 Sep 2016 17:37:43 +0300 Subject: [PATCH 1/4] Fix chat count --- chat/templates/chat_customer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html index 6819e67..9755e5a 100644 --- a/chat/templates/chat_customer.html +++ b/chat/templates/chat_customer.html @@ -140,7 +140,7 @@

{{ order }}

- + Исполнитель: {% if order.order.contractor %} {{ order.order.contractor.get_full_name }} From ede0306d927ec65647cc74f83d9f999db593514e Mon Sep 17 00:00:00 2001 From: Seghey Shishman Date: Thu, 22 Sep 2016 17:55:05 +0300 Subject: [PATCH 2/4] css edited --- assets/css/main.css | 70 +++++++++++++++++++++++------ assets/js/chat_customer.js | 2 +- chat/templates/chat_contractor.html | 8 ++++ 3 files changed, 65 insertions(+), 15 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 5546aa2..749771a 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -43,10 +43,13 @@ a, a:hover, a:focus, a:active { text-decoration: none !important; } -ul li { - list-style: none !important; - list-style-image: url(data:0) !important; - list-style-type: none !important; +.changeBlock ul li{ + list-style: inherit; !important; + display: list-item; +} + +.changeBlock ul{ + padding-left: 40px; } /* MAIN CLASSES */ @@ -205,10 +208,10 @@ ul li { .changeBlock { width: 485px; - height: 424px; + /*height: 424px;*/ overflow: hidden; padding: 113px 0 0 0; - text-align: center; + /*text-align: center;*/ position: relative; } @@ -227,13 +230,16 @@ ul li { .changeBlock > a { border: none; cursor: pointer; - width: 200px; height: 40px; border-radius: 40px; font-size: 20px; text-transform: uppercase; font-family: 'pfdintextcomppro-regular', sans-serif; letter-spacing: 4px; + position: relative; + top: -60px; + display: table; + margin: auto; } .changeBlock1 > a, .changeBlock1 > a:link, .changeBlock1 > a:visited { @@ -249,12 +255,12 @@ ul li { } .changeBlock p { - font-size: 16px; + /*font-size: 16px; width: 63%; margin: 71px auto 0 auto; text-align: left; line-height: 24px; - position: relative; + position: relative;*/ font-family: 'Arial-MT-Regular', sans-serif; } @@ -274,6 +280,7 @@ ul li { left: 50%; margin-left: -30px; background-color: white; + bottom: 60px; } .square { @@ -2272,21 +2279,21 @@ input[type="checkbox"]:checked + span { height: 18px; background: url('../img/listExecutor.png') no-repeat left; background-size: cover; - background-position: 0 0; + background-position: 0 -3px; } .listExecutor li:nth-child(2) a:before { height: 22px; background: url('../img/listExecutor.png') no-repeat left; background-size: cover; - background-position: 0 -19px; + background-position: 0 -23px; } .listExecutor li:last-child a:before { height: 19px; background: url('../img/listExecutor.png') no-repeat left; background-size: cover; - background-position: 0 -48px; + background-position: 0 -53px; } .doneBlock { @@ -3074,11 +3081,29 @@ input[type="checkbox"]:checked + span { .all1 { left: 20px; +} + +.all1 a:before{ + content: ''; + position: absolute; + width: 20px; + height: 18px; + top: 0px; + right: 40px; background: url('../img/prev.png') no-repeat top center; } .all2 { right: 20px; +} + +.all2 a:before{ + content: ''; + position: absolute; + width: 20px; + height: 18px; + top: 0px; + left: 40px; background: url('../img/next.png') no-repeat top center; } @@ -5952,9 +5977,9 @@ a.linkS2[data-target="#withdraw-money"]{ margin-top: 0px; } .changeBlock { - min-height: 650px; + /*min-height: 650px;*/ display: table; - padding: 113px 0 30px 0px; + padding: 143px 20px 120px 20px; } .commChat { position: relative; @@ -6109,4 +6134,21 @@ li.officeList.icon_tml > a > p{ border-radius: 15px; background-color: #00BB7B; } +.message_connect{ + font-family: 'pfdintextcomppro-regular', sans-serif; + letter-spacing: 2px; + text-transform: uppercase; + border: 1px solid #BEBEBE; + border-radius: 40px; + display: table; + color: #373737 !important; + padding: 12px 30px; + font-size: 15px; + margin: auto; + margin-bottom: 20px; +} +#simpleSpecContainer .-simple-spec-widget{ + display: block; +} + /*end_new*/ diff --git a/assets/js/chat_customer.js b/assets/js/chat_customer.js index ebc8f3a..a65172a 100644 --- a/assets/js/chat_customer.js +++ b/assets/js/chat_customer.js @@ -193,7 +193,7 @@ $(function () { if (statusNotAgreed) { if (!data.secure) { htmlInbox += '

' + - '
' + + '
' + 'Перейти в режим безопасной сделки
'; } diff --git a/chat/templates/chat_contractor.html b/chat/templates/chat_contractor.html index 3b51cea..9994ec0 100644 --- a/chat/templates/chat_contractor.html +++ b/chat/templates/chat_contractor.html @@ -177,6 +177,14 @@
+
+
+

ArturBaybulatov

+ 2016-09-07 17:09:52 +
+

Приглашаю в группу http://proekton.com/users/teams/128/

+ присоединиться +
From b641edef73459aae6a58419ec3ae4f8ba1ae24a4 Mon Sep 17 00:00:00 2001 From: PekopT Date: Thu, 22 Sep 2016 17:57:41 +0300 Subject: [PATCH 3/4] css main fix --- assets/css/main.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/css/main.css b/assets/css/main.css index 5546aa2..d58aa58 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -6027,6 +6027,8 @@ input[type="radio"]{ } .welcomeMain{ line-height: 48px; + font-family: 'pfdintextcomppro-regular', sans-serif; + font-size: 43.5px; } .menuUser > div{ padding: 10px 0; From 7808d3388ddd52addd4cd567df0166606ffbd13c Mon Sep 17 00:00:00 2001 From: Seghey Shishman Date: Thu, 22 Sep 2016 18:08:58 +0300 Subject: [PATCH 4/4] extracss edited --- assets/css/extra.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/css/extra.css b/assets/css/extra.css index c46e7fb..3455bcf 100644 --- a/assets/css/extra.css +++ b/assets/css/extra.css @@ -241,5 +241,7 @@ li a:active .count-tab, li a:hover .count-tab{ } .select2-drop { - width: 400px !important; + width: auto !important; + max-width: 400px; + }