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 21 additions and 17 deletions
Showing only changes of commit 7e10bc1d1c - Show all commits

View File

@ -1,4 +1,9 @@
// TODO: cleanup and refactor component markup and style // TODO: cleanup and refactor component markup and style
.modal-asset
align-items: center
display: flex !important
justify-content: center
.modal-asset-zoom .modal-asset-zoom
img img
display: block display: block
@ -31,7 +36,7 @@
.modal-body .modal-body
+margin(auto, x) +margin(auto, x)
max-width: 117.0rem max-width: calc(100% )
overflow-y: scroll overflow-y: scroll
+padding(3) +padding(3)
+padding(5, top) +padding(5, top)
@ -46,12 +51,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)
overflow: hidden overflow: hidden
+padding(4, y)
+media-md
max-width: map-get($container-max-widths, 'xxl')
.modal-header .modal-header
// TODO: consider changing background noise img raster to svg
background-blend-mode: multiply
background-color: var(--color-bg)
border-bottom: 0 border-bottom: 0
display: block display: block
justify-content: center justify-content: center
@ -67,22 +74,19 @@
width: 100% width: 100%
.modal-navigation .modal-navigation
&.modal-close, &.next, &.previous width: 7.2rem
&.modal-close,
&.next,
&.previous
position: absolute position: absolute
&.modal-close &.modal-close
right: var(--spacer-3) right: var(--spacer-4)
top: var(--spacer-3) top: var(--spacer-4)
+media-md
right: calc(var(--spacer) * 2)
top: calc(var(--spacer) * 2)
&.next, &.previous
top: 50%
&.next &.next
right: calc(var(--spacer) * 2) right: var(--spacer-4)
&.previous &.previous
left: calc(var(--spacer) * 2) left: var(--spacer-4)

View File

@ -30,7 +30,7 @@
{% 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-10.png' %}')"> <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="d-md-none p-3"> <div class="d-md-none p-3">
<div> <div>
<p class="text-muted">{{ asset.static_asset.get_source_type_display }}</p> <p class="text-muted">{{ asset.static_asset.get_source_type_display }}</p>