expo95-bugs

templates/client/includes/company/company_edit.html

@@ -595,9 +595,9 @@
 						</div>
 
 						<dd class="static-value">
-							<span class="full-complete {% if description_form.description.value %}{% else %}hidden{% endif %}">
-								{% if description_form.description.value %}{{ description_form.description.value }}{% endif %}
-							</span>
+							<div class="full-complete {% if description_form.description.value %}{% else %}hidden{% endif %} description-text">
+								{% if description_form.description.value %}{{ description_form.description.value|linebreaks }}{% endif %}
+							</div>
 							<span class="not-complete {% if description_form.description.value %}hidden{% else %}{% endif %}">
 								{% trans 'Не заполнено' %}<div class="add_link_text_text add_link_text"><b>+15</b></div>
 							</span>

templates/client/includes/company/company_object.html

@@ -120,7 +120,7 @@
                         {% endif %}
                         {% if company.description %}
                         <dt>{% trans 'О компании:' %}</dt>
-                        <dd>{{ company.description|safe }}</dd>
+                        <dd>{{ company.description|safe|linebreaks }}</dd>
                         {% endif %}
 					</dl>
 

templates/client/static_client/css/main.css

@@ -13192,6 +13192,13 @@ hr + .rq-note {
 		padding-top: 5px;
 		margin-bottom: 0;
 	}
+	.edit-profile.company .description-text{
+		padding-top: 4px;
+	}
+		.edit-profile.company .description-text p{
+			line-height: 15px;
+			font-size: 12px;
+		}
 	.edit-profile .theme-wrap .label,
 	.edit-profile .theme-wrap .input{
 		display: inline-block;
@@ -13212,6 +13219,9 @@ hr + .rq-note {
 	.company-preview .i-info .i-contacts .ic-buttons .soc-media-buttons{
 		margin-top: 12px;
 	}
+	.company-preview .i-info{
+		margin-bottom: 1em;
+	}
 	.profile-preview-btn{
 		margin-top: 1em;
 		margin-bottom: 2em;