EXPO-93 css bugs

remotes/origin/1203
pavel 11 years ago
parent 0defa1dfc9
commit c7b854575a
  1. 2
      templates/client/includes/company/company_edit.html
  2. 25
      templates/client/includes/company/company_object.html
  3. 23
      templates/client/static_client/css/main.css
  4. 2
      templates/client/static_client/css_min/main.min.css

@ -240,7 +240,7 @@
</div>
</div>
<hr />
<div class="add_link_teg">
<div class="form-item-wrap">
<div class="i-tags i-descr {% if company.tag.all|length > 0 %}{% else %}hidden{% endif %}">

@ -24,9 +24,10 @@
<div class="i-title">{{ company.name|safe }}</div>
</header>
<div class="i-area">
<a href="#">{{ company.specialization|linebreaks }}</a>
<div class="i-area brief">
{{ company.specialization|linebreaks }}
</div>
{% with themes=company.theme.all %}
<div class="i-area" id="theme-inf" data-theme="{% for th in themes %}{{ th.id }},{% endfor %}">
{% for th in themes %}
@ -36,17 +37,7 @@
{% endwith %}
<hr />
{% if company.tag.all|length > 0 %}
<div class="i-tags">
{% with tags=company.tag.all %}
{% for tag in tags %}
<a href="{{ company.catalog }}tag/{{ tag.url }}">{{ tag.name }}</a>,
{% endfor %}
{% endwith %}
</div>
<hr />
{% endif %}
{% if company.address_inf %}
<div class=" mb-1em address-wrap" id="address-wrap">
<a class="map-toggle " href="javascript:void(0);" data-show-text="{% trans 'Раскрыть карту' %}" data-hide-text="{% trans 'Скрыть карту' %}"><i class="fa fa-map-marker">&nbsp;</i><span class="label">Раскрыть карту</span></a>
@ -61,7 +52,17 @@
</div>
<hr />
{% endif %}
{% if company.tag.all|length > 0 %}
<div class="i-tags">
{% with tags=company.tag.all %}
{% for tag in tags %}
<a href="{{ company.catalog }}tag/{{ tag.url }}">{{ tag.name }}</a>,
{% endfor %}
{% endwith %}
</div>
<hr />
{% endif %}
<div class="i-contacts clearfix">
{% if company.facebook or company.linkedin or company.vk or company.twitter %}
<div class="ic-buttons">

@ -13189,7 +13189,7 @@ hr + .rq-note {
}
.add_link_teg .tags{
display: inline-block;
font-size: 14px;
font-size: 12px;
margin-top: 0;
}
.add_link_teg .e-btn{
@ -13232,11 +13232,23 @@ hr + .rq-note {
.company-preview .i-info .i-contacts .ic-buttons .soc-media-buttons{
margin-top: 12px;
}
.company-preview .i-info .brief{
font-size: 12px;
line-height: 16px;
color: #7e7e7e;
font-family: Arial, sans-serif;
}
.company-preview .i-info .brief p{
margin: 0;
}
.company-preview .i-info{
margin-bottom: 1em;
}
.company-preview .i-info .i-tags{
font-size: 12px;
}
.company-preview .pw-open{
margin-bottom: .6em;
margin-bottom: 1em;
}
.company-preview .soc-media-buttons{
margin-top: 2px !important;
@ -13536,9 +13548,16 @@ hr + .rq-note {
margin-top: 1em;
margin-bottom: 2em;
}
.address-wrap .i-descr{
font-family: 'dindisplay_pro', sans-serif;
font-size: 18px;
line-height: 21px;
color: #464646;
}
.address-wrap .map-wrap .gmap-canvas{
height: 308px;
}
.address-wrap .map-toggle{
display: block;
float: right;

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save