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
3 changed files with 34 additions and 14 deletions
Showing only changes of commit 2aa05f1b7c - Show all commits

View File

@ -53,6 +53,8 @@
.btns-toolbar .btns-toolbar
@extend .border-bottom @extend .border-bottom
flex-wrap: wrap
.checkbox-like .checkbox-like
span span
pointer-events: none pointer-events: none

View File

@ -1,3 +1,10 @@
.modal
height: auto
overflow-y: scroll
+media-md
height: 100%
// TODO: cleanup and refactor component markup and style // TODO: cleanup and refactor component markup and style
.modal-asset .modal-asset
&.show &.show
@ -42,7 +49,9 @@
max-width: calc(100% ) max-width: calc(100% )
overflow-y: scroll overflow-y: scroll
+padding(3) +padding(3)
+padding(5, top)
+media-md
+padding(5, top)
img img
border-radius: var(--border-radius) border-radius: var(--border-radius)
@ -58,9 +67,14 @@
.modal-dialog .modal-dialog
border-radius: var(--border-radius-lg) border-radius: var(--border-radius-lg)
height: 100vh height: 100vh
max-width: calc(100% - (7.2rem * 2 + var(--spacer-4) * 4) +margin(0, y)
overflow: hidden +padding(4, top)
+padding(4, y) max-width: 100%
+media-md
height: 100vh
max-width: calc(100% - (7.2rem * 2 + var(--spacer-4) * 4)
+padding(4, y)
.modal-header .modal-header
// TODO: consider changing background noise img raster to svg // TODO: consider changing background noise img raster to svg
@ -78,21 +92,26 @@
align-items: center align-items: center
cursor: zoom-in cursor: zoom-in
display: flex display: flex
height: calc(100vh - var(--spacer-4) * 2) // height must be explicitly defined in order to make img max-height work
justify-content: center justify-content: center
width: 100% width: 100%
+media-md
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 width: 7.2rem
&.modal-close, &.modal-close,
&.next, &.next,
&.previous &.previous
position: absolute +media-md
position: absolute
&.modal-close &.modal-close
right: var(--spacer-4) right: var(--spacer-4)
top: var(--spacer-4)
+media-md
top: var(--spacer-4)
&.next &.next
right: var(--spacer-4) right: var(--spacer-4)

View File

@ -3,19 +3,19 @@
{% load pipeline %} {% load pipeline %}
{% if next_asset %} {% if next_asset %}
<button class="btn btn-lg modal-navigation next" <button class="btn btn-lg 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 modal-navigation previous" <button class="btn btn-lg 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 modal-navigation modal-close d-none d-md-block" data-bs-dismiss="modal"> <button class="btn btn-lg 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>
@ -30,10 +30,9 @@
{% include 'common/components/spoiler_alert.html' %} {% include 'common/components/spoiler_alert.html' %}
{% endif %} {% endif %}
<div class="col-md-7 modal-header p-0" style="background-image: url('{% static 'common/images/asset-bg-noise-2x-opacity-20.png' %}')"> <div class="col-lg-7 col-md-6 modal-header p-0" style="background-image: url('{% static 'common/images/asset-bg-noise-2x-opacity-20.png' %}')">
<div class="d-md-none p-3"> <div class="align-items-center d-flex d-md-none justify-content-between px-3 py-4">
<div> <div>
<p class="text-muted">{{ asset.static_asset.get_source_type_display }}</p>
<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 btn-lg modal-close modal-navigation" data-bs-dismiss="modal">
@ -63,7 +62,7 @@
{% include 'common/components/content_locked.html' with background=asset.static_asset.thumbnail_s_url %} {% include 'common/components/content_locked.html' with background=asset.static_asset.thumbnail_s_url %}
{% endif %} {% endif %}
</div> </div>
<div class="col-md-5 modal-body"> <div class="col-lg-5 col-md-6 modal-body">
<div class="align-items-start row"> <div class="align-items-start row">
<div class="col-12 col-md mb-2"> <div class="col-12 col-md mb-2">
<div class="d-none d-md-block"> <div class="d-none d-md-block">