From 2e8985a92a2537646eef734e650273d5890d309e Mon Sep 17 00:00:00 2001
From: Seghey Shishman <inbrogues1@gmail.com>
Date: Wed, 7 Sep 2016 16:15:23 +0300
Subject: [PATCH] css edited

---
 assets/css/main.css                           | 21 ++++----
 templates/partials/header.html                | 54 ++++++++++---------
 .../templatetags/contractor_indicator.html    |  2 +-
 3 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/assets/css/main.css b/assets/css/main.css
index 0445a58..c791120 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -266,12 +266,11 @@ ul li {
     color: black;
 }
 
-.changeBlock p:after {
+.changeBlock:after {
     content: '';
     position: absolute;
     width: 66px;
     height: 1px;
-    bottom: -52px;
     left: 50%;
     margin-left: -30px;
     background-color: white;
@@ -312,7 +311,7 @@ ul li {
 .imgProfile {
     width: 75px;
     height: 75px;
-    float: left;
+    float: right;
     margin: 0 0 0 -60px;
 }
 
@@ -323,7 +322,7 @@ ul li {
 }
 
 .infoProfile {
-    float: left;
+    float: right;
 }
 
 .infoProfile .btn-group .btn {
@@ -352,7 +351,7 @@ ul li {
 .rating {
     width: 46px;
     height: 46px;
-    float: left;
+    float: right;
     border-radius: 100%;
     background-color: #4D4D4D;
     margin: 15px 0 0 10px;
@@ -384,8 +383,8 @@ ul li {
     color: #ff2c2c;
     font-size: 18px;
     font-family: 'pfdintextcomppro-regular', sans-serif;
-    float: left;
-    margin: 28px 0 0 15px;
+    float: right;
+    margin: 28px 0 0 9px;
     cursor: pointer;
 }
 
@@ -3418,7 +3417,9 @@ input[type="checkbox"]:checked + span {
     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;
     letter-spacing: 2px;
     text-transform: uppercase;
@@ -5962,7 +5963,7 @@ a.linkS2[data-target="#withdraw-money"]{
     border-radius: 50px;
     border: 1px solid #42B476;
 }
-.laladsd{
-    color: inherit;
+input[type="radio"]{
+    opacity: 0;
 }
 /*end_new*/
\ No newline at end of file
diff --git a/templates/partials/header.html b/templates/partials/header.html
index ab45a40..4e15491 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -66,29 +66,10 @@
             
             {% if request.user.is_authenticated %}
                 <div class="col-lg-2">
-                    <div class="imgProfile">
-                        {% if request.user.is_contractor %}
-                            <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>
+
+                    {% if request.user.is_contractor %}
+                        {% contractor_indicator request.user %}
+                    {% endif %}
 
                     <div class="infoProfile disTab">
                         <div class="btn-group" role="group">
@@ -139,9 +120,30 @@
                         </div>
                     </div>
 
-                    {% if request.user.is_contractor %}
-                        {% contractor_indicator request.user %}
-                    {% endif %}
+                    <div class="imgProfile">
+                        {% if request.user.is_contractor %}
+                            <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>
             {% else %}
                 <div class="col-lg-2">
diff --git a/users/templates/templatetags/contractor_indicator.html b/users/templates/templatetags/contractor_indicator.html
index 1a123d7..ee9bd03 100644
--- a/users/templates/templatetags/contractor_indicator.html
+++ b/users/templates/templatetags/contractor_indicator.html
@@ -1,5 +1,5 @@
+<p class="ratingPer">{{ current_indicator }}%</p>
 <div class="rating">
     <div class="ratingInset" style="clip:rect(0px, {{ current_indicator_px }}px, 50px, 0px);"></div>
     <div class="iconRating"></div>
 </div>
-<p class="ratingPer">{{ current_indicator }}%</p>