Blender Studio pull request - Version 2.2.0 update #104394

Merged
Márton Lente merged 64 commits from ui/v2.2.0 into main 2024-04-08 16:32:44 +02:00
2 changed files with 7 additions and 6 deletions
Showing only changes of commit e6653742d3 - Show all commits

View File

@ -73,7 +73,7 @@
+media-md +media-md
height: 100vh height: 100vh
max-width: calc(100% - (7.2rem * 2 + var(--spacer-4) * 4) max-width: calc(100% - (5.6rem * 2 + var(--spacer-4) * 4)
+padding(4, y) +padding(4, y)
.modal-header .modal-header
@ -99,7 +99,8 @@
height: calc(100vh - var(--spacer-4) * 2) // height must be explicitly defined in order to make img max-height work height: calc(100vh - var(--spacer-4) * 2) // height must be explicitly defined in order to make img max-height work
.modal-navigation .modal-navigation
width: 7.2rem +media-md
width: 5.6rem
&.modal-close, &.modal-close,
&.next, &.next,

View File

@ -3,19 +3,19 @@
{% load pipeline %} {% load pipeline %}
{% if next_asset %} {% if next_asset %}
<button class="btn btn-lg d-none d-md-flex modal-navigation next" <button class="btn d-none d-md-flex modal-navigation next"
data-url="{% url 'api-asset' next_asset.id %}?site_context={{ site_context }}" data-asset-id="{{ next_asset.id }}"> data-url="{% url 'api-asset' next_asset.id %}?site_context={{ site_context }}" data-asset-id="{{ next_asset.id }}">
<i class="i-chevron-right"></i> <i class="i-chevron-right"></i>
</button> </button>
{% endif %} {% endif %}
{% if previous_asset %} {% if previous_asset %}
<button class="btn btn-lg d-md-block d-none modal-navigation previous" <button class="btn d-md-block d-none modal-navigation previous"
data-url="{% url 'api-asset' previous_asset.id %}?site_context={{ site_context }}" data-url="{% url 'api-asset' previous_asset.id %}?site_context={{ site_context }}"
data-asset-id="{{ previous_asset.id }}"> data-asset-id="{{ previous_asset.id }}">
<i class="i-chevron-left"></i> <i class="i-chevron-left"></i>
</button> </button>
{% endif %} {% endif %}
<button class="btn btn-lg d-md-block d-none modal-navigation modal-close d-none d-md-block" data-bs-dismiss="modal"> <button class="btn d-md-block d-none modal-navigation modal-close d-none d-md-block" data-bs-dismiss="modal">
<i class="i-cancel"></i> <i class="i-cancel"></i>
</button> </button>
@ -35,7 +35,7 @@
<div> <div>
<h3 class="mb-0">{{ asset.name }}</h3> <h3 class="mb-0">{{ asset.name }}</h3>
</div> </div>
<button class="btn btn-lg modal-close modal-navigation" data-bs-dismiss="modal"> <button class="btn modal-close modal-navigation" data-bs-dismiss="modal">
<i class="i-cancel"></i> <i class="i-cancel"></i>
</button> </button>
</div> </div>