remotes/origin/PR-39
Seghey Shishman 9 years ago
parent 3b82607df1
commit ede0306d92
  1. 70
      assets/css/main.css
  2. 2
      assets/js/chat_customer.js
  3. 8
      chat/templates/chat_contractor.html

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

@ -193,7 +193,7 @@ $(function () {
if (statusNotAgreed) {
if (!data.secure) {
htmlInbox += '<div class="box-sizing disTab">' +
'<div class="checkbox"><input name="secure" id="secureOrder" type="checkbox" style="opacity:1">' +
'<div class="checkbox"><label><input id="id_cro" name="cro" type="checkbox"><span></span></label>' +
'Перейти в режим безопасной сделки</div></div>';
}

@ -177,6 +177,14 @@
</div>
<div class="col-lg-6 commChat">
<div id="message-chat-order-space"></div>
<div class="col-lg-12 insetCommChat">
<div class="topCommChat">
<p class="nameCommChat">ArturBaybulatov</p>
<span>2016-09-07 17:09:52</span>
</div>
<p class="textCommChat">Приглашаю в группу http://proekton.com/users/teams/128/</p>
<a href="#" class="message_connect">присоединиться</a>
</div>
<form id="chat-order-add">
<input type="hidden" id="orderId" name="orderId">
<input type="hidden" id="senderId" name="senderId" value="{{ request.user.pk }}">

Loading…
Cancel
Save