remotes/origin/PR-39
Seghey Shishman 10 years ago
parent 64cc28d64e
commit 2e8985a92a
  1. 21
      assets/css/main.css
  2. 54
      templates/partials/header.html
  3. 2
      users/templates/templatetags/contractor_indicator.html

@ -266,12 +266,11 @@ ul li {
color: black; color: black;
} }
.changeBlock p:after { .changeBlock:after {
content: ''; content: '';
position: absolute; position: absolute;
width: 66px; width: 66px;
height: 1px; height: 1px;
bottom: -52px;
left: 50%; left: 50%;
margin-left: -30px; margin-left: -30px;
background-color: white; background-color: white;
@ -312,7 +311,7 @@ ul li {
.imgProfile { .imgProfile {
width: 75px; width: 75px;
height: 75px; height: 75px;
float: left; float: right;
margin: 0 0 0 -60px; margin: 0 0 0 -60px;
} }
@ -323,7 +322,7 @@ ul li {
} }
.infoProfile { .infoProfile {
float: left; float: right;
} }
.infoProfile .btn-group .btn { .infoProfile .btn-group .btn {
@ -352,7 +351,7 @@ ul li {
.rating { .rating {
width: 46px; width: 46px;
height: 46px; height: 46px;
float: left; float: right;
border-radius: 100%; border-radius: 100%;
background-color: #4D4D4D; background-color: #4D4D4D;
margin: 15px 0 0 10px; margin: 15px 0 0 10px;
@ -384,8 +383,8 @@ ul li {
color: #ff2c2c; color: #ff2c2c;
font-size: 18px; font-size: 18px;
font-family: 'pfdintextcomppro-regular', sans-serif; font-family: 'pfdintextcomppro-regular', sans-serif;
float: left; float: right;
margin: 28px 0 0 15px; margin: 28px 0 0 9px;
cursor: pointer; cursor: pointer;
} }
@ -3418,7 +3417,9 @@ input[type="checkbox"]:checked + span {
margin: 10px 0 20px 0; margin: 10px 0 20px 0;
} }
.textAreaBlock2 a, .textAreaBlock2 a:link, .textAreaBlock2 a:visited { .textAreaBlock2 a:not(.cke_button, .cke_combo_button, .cke_path_item),
.textAreaBlock2 a:link:not(.cke_button, .cke_combo_button, .cke_path_item),
.textAreaBlock2 a:visited:not(.cke_button, .cke_combo_button, .cke_path_item) {
font-family: 'pfdintextcomppro-regular', sans-serif; font-family: 'pfdintextcomppro-regular', sans-serif;
letter-spacing: 2px; letter-spacing: 2px;
text-transform: uppercase; text-transform: uppercase;
@ -5962,7 +5963,7 @@ a.linkS2[data-target="#withdraw-money"]{
border-radius: 50px; border-radius: 50px;
border: 1px solid #42B476; border: 1px solid #42B476;
} }
.laladsd{ input[type="radio"]{
color: inherit; opacity: 0;
} }
/*end_new*/ /*end_new*/

@ -66,29 +66,10 @@
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<div class="col-lg-2"> <div class="col-lg-2">
<div class="imgProfile">
{% if request.user.is_contractor %} {% if request.user.is_contractor %}
<a href="{{ profile_url }}"> {% contractor_indicator request.user %}
{% if request.user.avatar %} {% endif %}
{% thumbnail request.user.avatar "75x75" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% endif %}
</a>
{% elif request.user.is_customer %}
<a href="{{ profile_url }}">
{% if request.user.avatar %}
{% thumbnail request.user.avatar "75x75" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% endif %}
</a>
{% endif %}
</div>
<div class="infoProfile disTab"> <div class="infoProfile disTab">
<div class="btn-group" role="group"> <div class="btn-group" role="group">
@ -139,9 +120,30 @@
</div> </div>
</div> </div>
{% if request.user.is_contractor %} <div class="imgProfile">
{% contractor_indicator request.user %} {% if request.user.is_contractor %}
{% endif %} <a href="{{ profile_url }}">
{% if request.user.avatar %}
{% thumbnail request.user.avatar "75x75" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% endif %}
</a>
{% elif request.user.is_customer %}
<a href="{{ profile_url }}">
{% if request.user.avatar %}
{% thumbnail request.user.avatar "75x75" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% endif %}
</a>
{% endif %}
</div>
</div> </div>
{% else %} {% else %}
<div class="col-lg-2"> <div class="col-lg-2">

@ -1,5 +1,5 @@
<p class="ratingPer">{{ current_indicator }}%</p>
<div class="rating"> <div class="rating">
<div class="ratingInset" style="clip:rect(0px, {{ current_indicator_px }}px, 50px, 0px);"></div> <div class="ratingInset" style="clip:rect(0px, {{ current_indicator_px }}px, 50px, 0px);"></div>
<div class="iconRating"></div> <div class="iconRating"></div>
</div> </div>
<p class="ratingPer">{{ current_indicator }}%</p>

Loading…
Cancel
Save