remotes/origin/PR-39
Mukhtar 9 years ago
parent 7d45403e75
commit f85f7c2f46
  1. 56
      assets/css/extra.css
  2. 11
      users/templates/contractor_filter.html
  3. 2
      users/templates/contractor_office.html

@ -97,7 +97,6 @@
margin: 33px 0 0 0; margin: 33px 0 0 0;
} }
.form-regestration .errorlist { .form-regestration .errorlist {
color: red; color: red;
width: 360px; width: 360px;
@ -112,14 +111,14 @@
color: #777620; color: #777620;
} }
#document-send-contact a, #document-send-order a , #document-send a { #document-send-contact a, #document-send-order a, #document-send a {
float: left; float: left;
font-family: 'pfdintextcomppro-regular', sans-serif; font-family: 'pfdintextcomppro-regular', sans-serif;
color: #373737; color: #373737;
font-size: 15px; font-size: 15px;
border:0; border: 0;
padding: 0px; padding: 0px;
text-transform:lowercase; text-transform: lowercase;
} }
.documentsChat a.file-link, .documentsChat a.file-link:link, .documentsChat a.file-link:visited { .documentsChat a.file-link, .documentsChat a.file-link:link, .documentsChat a.file-link:visited {
@ -129,8 +128,8 @@
font-family: Arial, Verdana, Helvetica, sans-serif; font-family: Arial, Verdana, Helvetica, sans-serif;
font-size: 12px; font-size: 12px;
font-style: italic; font-style: italic;
padding:0; padding: 0;
background:none; background: none;
float: none; float: none;
margin: 19px 0 -10px 0; margin: 19px 0 -10px 0;
} }
@ -139,7 +138,6 @@
font-size: 20px; font-size: 20px;
} }
#message-chat-order-space, #message-chat-team-space { #message-chat-order-space, #message-chat-team-space {
height: 312px; height: 312px;
display: block; display: block;
@ -151,7 +149,7 @@
} }
.infoProfile .dropdown-menu .icon_mm3 a span.badge-count { .infoProfile .dropdown-menu .icon_mm3 a span.badge-count {
left:120px; left: 120px;
background: none; background: none;
background-color: #FF0027; background-color: #FF0027;
color: white; color: white;
@ -159,13 +157,12 @@
height: 25px; height: 25px;
line-height: 25px; line-height: 25px;
text-align: center; text-align: center;
font-size:14px; font-size: 14px;
border-radius: 100%; border-radius: 100%;
top: 1px; top: 1px;
} }
.deleteOrder:after { .deleteOrder:after {
content: ''; content: '';
position: absolute; position: absolute;
@ -177,7 +174,6 @@
top: 2px; top: 2px;
} }
.deleteOrder, .deleteOrder:link, .deleteOrder:visited { .deleteOrder, .deleteOrder:link, .deleteOrder:visited {
color: #5a5a5a; color: #5a5a5a;
font-size: 14px; font-size: 14px;
@ -189,7 +185,6 @@
font-style: italic; font-style: italic;
} }
.trashedOrderBlock { .trashedOrderBlock {
width: 100%; width: 100%;
float: left; float: left;
@ -212,12 +207,11 @@
-webkit-transform: scale(1.03); -webkit-transform: scale(1.03);
-moz-transform: scale(1.03); -moz-transform: scale(1.03);
transform: scale(1.03); transform: scale(1.03);
box-shadow: 0 0 10px rgba(0,0,0,0.7); box-shadow: 0 0 10px rgba(0, 0, 0, 0.7);
z-index: 999; z-index: 999;
} }
.count-tab {
.count-tab{
margin-left: 10px; margin-left: 10px;
width: 35px; width: 35px;
height: 35px; height: 35px;
@ -235,7 +229,7 @@
background-color: #ebebeb; background-color: #ebebeb;
} }
li a:active .count-tab, li a:hover .count-tab{ li a:active .count-tab, li a:hover .count-tab {
background-color: #FF0027; background-color: #FF0027;
color: white; color: white;
} }
@ -249,3 +243,33 @@ li a:active .count-tab, li a:hover .count-tab{
.-bold { .-bold {
font-weight: bold; font-weight: bold;
} }
.mainContainer {
background-repeat: repeat;
height: 100%;
}
.nameExecutor a:link, .nameExecutor:visited, .nameExecutor a {
-ms-word-break: break-all;
word-break: break-all;
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
white-space: -moz-pre-wrap;
white-space: pre-wrap; /* css-3 */
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
word-wrap: break-word; /* Internet Explorer 5.5+ */
/*width:100px;*/
}
.busy {
background-color: red;
}
.busy::after {
border-color: red transparent transparent red;
}

@ -201,7 +201,7 @@
<p class="nameExecutor"> <p class="nameExecutor">
<a href="{% url 'users:team-profile' pk=team.pk %}">{{ team.name }}</a> <a href="{% url 'users:team-profile' pk=team.pk %}">{{ team.name }}</a>
</p> </p>
<p class="navv2">На сайте 8 лет и 3 месяца</p> <p class="navv2">На сайте c {{ team.created|date:"d M Y"}}</p>
<div class="statusUser">Свободен</div> <div class="statusUser">Свободен</div>
</div> </div>
@ -322,8 +322,13 @@
<p class="nameExecutor"> <p class="nameExecutor">
<a href="{% url 'users:contractor-profile' pk=contractor.pk %}">{{ contractor.get_full_name }} [{{ contractor.username }}]</a> <a href="{% url 'users:contractor-profile' pk=contractor.pk %}">{{ contractor.get_full_name }} [{{ contractor.username }}]</a>
</p> </p>
<p class="navv2">На сайте 8 лет и 3 месяца</p> <p class="navv2">На сайте c {{ contractor.created|date:"d M Y"}}</p>
<div class="statusUser">Свободен</div>
{% if contractor.contractor_status == 'free' %}
<div class="statusUser">Свободен</div>
{% else %}
<div class="statusUser busy">Занят</div>
{% endif %}
</div> </div>

@ -139,6 +139,8 @@
</p> </p>
<div class="statusUser st-new">Свободен</div> <div class="statusUser st-new">Свободен</div>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">

Loading…
Cancel
Save