mirror of
https://github.com/tabler/tabler.git
synced 2025-12-21 17:34:25 +04:00
Merge branch 'dev-illustrations' of https://github.com/tabler/tabler into dev-illustrations
This commit is contained in:
@@ -48,7 +48,6 @@ illustrations = illustrations | push: illustration %} {% endif %} {% endfor %} {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-label mt-4">Select SVG illustration</div>
|
<div class="form-label mt-4">Select SVG illustration</div>
|
||||||
<<<<<<< HEAD
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
{% for illustration in illustrations %}
|
{% for illustration in illustrations %}
|
||||||
<div class="col-3">
|
<div class="col-3">
|
||||||
@@ -58,12 +57,6 @@ illustrations = illustrations | push: illustration %} {% endif %} {% endfor %} {
|
|||||||
{{ illustration }}
|
{{ illustration }}
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
=======
|
|
||||||
<div class="row g-2">
|
|
||||||
{% for illustration in illustrations %}
|
|
||||||
<div class="col-3">
|
|
||||||
<a class="d-block cursor-pointer rounded{% if forloop.first %} bg-body{% endif %} js-select-illustration" data-id="{{ illustration.slug }}"> {{ illustration | replace: '<svg ', '<svg class="w-100 h-auto" ' }} </a>
|
|
||||||
>>>>>>> 69599f8409bdbf132f6b9238075fd9aa79cdcfcc
|
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user