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 19 additions and 3 deletions
Showing only changes of commit 474683cb51 - Show all commits

View File

@ -30,24 +30,40 @@
z-index: 1 z-index: 1
.modal-body .modal-body
padding: var(--spacer) +margin(auto, x)
max-width: 117.0rem
overflow-y: scroll
+padding(3)
+padding(5, top)
.modal-content .modal-content
background-color: var(--color-bg-secondary) background-color: var(--color-bg-secondary)
+media-md
flex-direction: row
height: 100%
.modal-dialog .modal-dialog
border-radius: var(--border-radius-lg) border-radius: var(--border-radius-lg)
height: 100vh
overflow: hidden overflow: hidden
+media-md
max-width: map-get($container-max-widths, 'xxl')
.modal-header .modal-header
border-bottom: 0 border-bottom: 0
display: block display: block
justify-content: center
+media-md +media-md
align-items: center
display: flex display: flex
.modal-asset-img-wrapper .modal-asset-img-wrapper
cursor: zoom-in cursor: zoom-in
display: flex
justify-content: center
width: 100% width: 100%
.modal-navigation .modal-navigation

View File

@ -30,7 +30,7 @@
{% include 'common/components/spoiler_alert.html' %} {% include 'common/components/spoiler_alert.html' %}
{% endif %} {% endif %}
<div class="modal-header p-0"> <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="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>
@ -63,7 +63,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="modal-body"> <div class="col-md-5 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">