From bcca2f37709e73ac4509d7a2c5a3384ad996569a Mon Sep 17 00:00:00 2001 From: Seghey Shishman Date: Mon, 19 Sep 2016 22:10:08 +0300 Subject: [PATCH 1/6] css edited --- assets/css/main.css | 37 +++++++++++++------ .../templatetags/user_new_count_orders.html | 2 +- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 537ff3a..7719fa9 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -2776,14 +2776,16 @@ input[type="checkbox"]:checked + span { cursor: move; } -.compTable tr:hover:not(:first-child) { +.compTable tr:hover { z-index: 999; - display: flex; + display: table-row; position: relative; - -webkit-transform: scale(1.04); - -moz-transform: scale(1.04); - transform: scale(1.04); - box-shadow: 0 0 10px rgba(0,0,0,0.8); + -webkit-transform: scale(1.02); + -moz-transform: scale(1.02); + transform: scale(1.02); + /*box-shadow: 0 0 10px rgba(0,0,0,0.8);*/ + outline: 1px solid #DAD9D9; + cursor: move; } .compTable tr:hover td:first-child { @@ -2803,10 +2805,15 @@ input[type="checkbox"]:checked + span { border-bottom: 1px solid #DAD9D9 !important; } -.compTable tr th, .compTable tr td { - display: block; +/*.compTable tr th, .compTable tr td { + display: block float: left; text-align: center; +}*/ +.compTable tr th, .compTable tr td { + display: table-cell; + vertical-align: middle; + text-align: center; } .compTable tr th:first-child, @@ -2908,7 +2915,7 @@ input[type="checkbox"]:checked + span { .compTable tr td:nth-child(6) ul { float: left; - margin: 29px 0 0 72px; + margin: 0px 0 0 72px; } .compTable tr td:nth-child(6) ul li { @@ -2973,7 +2980,6 @@ input[type="checkbox"]:checked + span { font-weight: bold; font-family: Arial, Verdana, Helvetica, sans-serif; position: relative; - margin-bottom: 20px; position: relative; width: 100%; float: left; @@ -5058,7 +5064,7 @@ input[type="radio"]:checked + span { .list-summ li:nth-child(3):before { width: 22px; height: 22px; - background: url('../img/chat.png') no-repeat center; + background: url('../img/skype.png') no-repeat center; background-size: cover; left: -42px; top: 0; @@ -6083,4 +6089,13 @@ button[data-id="stagesSelect"], button[data-id="stagesSelect"]:hover{ background: transparent; width: 300px; } +li.officeList.icon_tml > a > p{ + display: inline-block; + padding: 5px 7px 3px 7px; + background: #ff0000; + border-radius: 35px; + position: absolute; + right: -34px; + top: -4px; +} /*end_new*/ diff --git a/users/templates/templatetags/user_new_count_orders.html b/users/templates/templatetags/user_new_count_orders.html index b61b777..8b9b759 100644 --- a/users/templates/templatetags/user_new_count_orders.html +++ b/users/templates/templatetags/user_new_count_orders.html @@ -1 +1 @@ -{{ new_count }} +

{{ new_count }}

From baf25e5e6f9e10b54c6f7a60be5b118fcd908dbe Mon Sep 17 00:00:00 2001 From: Seghey Shishman Date: Mon, 19 Sep 2016 22:50:17 +0300 Subject: [PATCH 2/6] 94 --- work_sell/templates/worksell_edit.html | 40 +++++++++++++++----------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/work_sell/templates/worksell_edit.html b/work_sell/templates/worksell_edit.html index 2f9340f..6875596 100644 --- a/work_sell/templates/worksell_edit.html +++ b/work_sell/templates/worksell_edit.html @@ -70,7 +70,9 @@
- {{ form.currency}} +
+ {{ form.currency}} +
@@ -82,21 +84,27 @@
- {{ form.term_type }} +
+ {{ form.term_type }} +
-
-

Вид строительства {{ form.construction_type.errors.as_text }}

- {{ form.construction_type }} +
+
+

Вид строительства {{ form.construction_type.errors.as_text }}

+ {{ form.construction_type }} +
-
-

Классификация здания {{ form.building_classification.errors.as_text }}

- {{ form.building_classification }} +
+
+

Классификация здания {{ form.building_classification.errors.as_text }}

+ {{ form.building_classification }} +
@@ -130,13 +138,13 @@
- - @@ -144,7 +152,7 @@
-