CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Improve margin arount product picture

Browse Source
This commit is contained in:
Raphael Michel
2017-08-30 17:32:52 +02:00
parent ce27f8e89c
commit f6b01b6e02
3 changed files with 59 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/pretix/presale/templates/pretixpresale/event/index.html
View File

@@ -177,23 +177,25 @@
alt="{{ item.name }}"/> alt="{{ item.name }}"/>
</a> </a>
{% endif %} {% endif %}
<a href="#" data-toggle="variations"> <div class="product-description {% if item.picture %}with-picture{% endif %}">
<strong>{{ item.name }}</strong> <a href="#" data-toggle="variations">
</a> <strong>{{ item.name }}</strong>
{% if item.description %} </a>
<div class="product-description"> {% if item.description %}
{{ item.description|localize|rich_text }} <div class="product-description">
</div> {{ item.description|localize|rich_text }}
{% endif %} </div>
{% if item.min_per_order and item.min_per_order > 1 %} {% endif %}
<p> {% if item.min_per_order and item.min_per_order > 1 %}
<small> <p>
{% blocktrans trimmed with num=item.min_per_order %} <small>
minimum amount to order: {{ num }} {% blocktrans trimmed with num=item.min_per_order %}
{% endblocktrans %} minimum amount to order: {{ num }}
</small> {% endblocktrans %}
</p> </small>
{% endif %} </p>
{% endif %}
</div>
</div> </div>
<div class="col-md-2 col-xs-6 price"> <div class="col-md-2 col-xs-6 price">
{% if item.min_price != item.max_price or item.free_price %} {% if item.min_price != item.max_price or item.free_price %}
@@ -293,24 +295,26 @@
alt="{{ item.name }}"/> alt="{{ item.name }}"/>
</a> </a>
{% endif %} {% endif %}
<strong>{{ item.name }}</strong> <div class="product-description {% if item.picture %}with-picture{% endif %}">
{% if item.description %} <strong>{{ item.name }}</strong>
<div class="product-description"> {% if item.description %}
{{ item.description|localize|rich_text }} <div class="product-description">
</div> {{ item.description|localize|rich_text }}
{% endif %} </div>
{% if event.settings.show_quota_left %} {% endif %}
{% include "pretixpresale/event/fragment_quota_left.html" with avail=item.cached_availability %} {% if event.settings.show_quota_left %}
{% endif %} {% include "pretixpresale/event/fragment_quota_left.html" with avail=item.cached_availability %}
{% if item.min_per_order and item.min_per_order > 1 %} {% endif %}
<p> {% if item.min_per_order and item.min_per_order > 1 %}
<small> <p>
{% blocktrans trimmed with num=item.min_per_order %} <small>
minimum amount to order: {{ num }} {% blocktrans trimmed with num=item.min_per_order %}
{% endblocktrans %} minimum amount to order: {{ num }}
</small> {% endblocktrans %}
</p> </small>
{% endif %} </p>
{% endif %}
</div>
</div> </div>
<div class="col-md-2 col-xs-6 price"> <div class="col-md-2 col-xs-6 price">
{% if item.free_price %} {% if item.free_price %}

28
src/pretix/presale/templates/pretixpresale/event/voucher.html
View File

@@ -45,12 +45,14 @@
alt="{{ item.name }}"/> alt="{{ item.name }}"/>
</a> </a>
{% endif %} {% endif %}
<strong>{{ item.name }}</strong> <div class="product-description {% if item.picture %}with-picture{% endif %}">
{% if item.description %} <strong>{{ item.name }}</strong>
<div class="product-description"> {% if item.description %}
{{ item.description|localize|rich_text }} <div class="product-description">
</div> {{ item.description|localize|rich_text }}
{% endif %} </div>
{% endif %}
</div>
</div> </div>
<div class="col-md-2 col-xs-6 price"> <div class="col-md-2 col-xs-6 price">
{% if item.min_price != item.max_price or item.free_price %} {% if item.min_price != item.max_price or item.free_price %}
@@ -135,12 +137,14 @@
alt="{{ item.name }}"/> alt="{{ item.name }}"/>
</a> </a>
{% endif %} {% endif %}
<strong>{{ item.name }}</strong> <div class="product-description {% if item.picture %}with-picture{% endif %}">
{% if item.description %} <strong>{{ item.name }}</strong>
<div class="product-description"> {% if item.description %}
{{ item.description|localize|rich_text }} <div class="product-description">
</div> {{ item.description|localize|rich_text }}
{% endif %} </div>
{% endif %}
</div>
</div> </div>
<div class="col-md-2 col-xs-6 price"> <div class="col-md-2 col-xs-6 price">
{% if item.free_price %} {% if item.free_price %}

4
src/pretix/static/pretixpresale/scss/_event.scss
View File

@@ -30,6 +30,10 @@
display: block; display: block;
} }
.product-description.with-picture {
margin-left: 70px;
}
.productpicture { .productpicture {
float: left; float: left;
margin-right: 10px; margin-right: 10px;