studio/blender-studio
3
4
Fork 4
Code Issues 38 Pull Requests 2 Projects 1 Releases 5 Wiki Activity

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
Conversation 0 Commits 64 Files Changed 30 +7 -5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2c873554ca - Show all commits

2
common/static/common/styles/studio/_modal.sass
View File

@ -51,7 +51,7 @@
+padding(3) +padding(3)
+media-md +media-md
+padding(5, top) +padding(4, top)
img img
border-radius: var(--border-radius) border-radius: var(--border-radius)

10
common/templates/common/components/modal_asset.html
View File

@ -66,11 +66,8 @@
<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">
<h2> <h2 class="h3">
{{ asset.name }} {{ asset.name }}
{% if asset.is_free %}
{% include "common/components/cards/pill.html" with class="ms-1" label='Free' %}
{% endif %}
</h2> </h2>
</div> </div>
</div> </div>
@ -137,6 +134,11 @@
{# TODO: Check style 'text-sm' #} {# TODO: Check style 'text-sm' #}
<div class="align-items-end col d-flex flex-column justify-content-end text-muted text-sm x-sm"> <div class="align-items-end col d-flex flex-column justify-content-end text-muted text-sm x-sm">
<div class="d-flex"> <div class="d-flex">
{% if asset.is_free %}
<div class="me-2">
{% include "common/components/cards/pill.html" with class="fs-sm ms-1" label='Free' %}
</div>
{% endif %}
<div class="me-2"> <div class="me-2">
<div class="badge fs-sm"> <div class="badge fs-sm">
{{ asset.static_asset.get_source_type_display }} {{ asset.static_asset.get_source_type_display }}