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 +87 -81
1 changed files with 87 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d17fc89428 - Show all commits

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

@ -72,16 +72,12 @@
</div> </div>
</div> </div>
</div> </div>
<div class="align-items-start mb-3 row">
<div class="col-12 col-md mb-2 pb-24">
{% include "common/components/navigation/buttons_toolbar.html" with item=asset %}
</div>
</div>
<div class="align-items-center mb-3 row"> <div class="align-items-center mb-3 row">
<div class="col-12">
<div class="pb-3 row">
<div class="col-auto d-flex"> <div class="col-auto d-flex">
{% include 'common/components/cards/card_profile.html' with user=asset.static_asset.user title="Publisher" %} {% include 'common/components/cards/card_profile.html' with user=asset.static_asset.user title="Publisher" %}
</div> </div>
{# Exclude the author in case author is mistakenly included into contributors as well #} {# Exclude the author in case author is mistakenly included into contributors as well #}
{% with asset_author=asset.static_asset.author|default:asset.static_asset.user contributors=asset.static_asset.contributors %} {% with asset_author=asset.static_asset.author|default:asset.static_asset.user contributors=asset.static_asset.contributors %}
{% if contributors.count > 1 or contributors.count == 1 and contributors.first.pk != asset_author.pk %} {% if contributors.count > 1 or contributors.count == 1 and contributors.first.pk != asset_author.pk %}
@ -166,6 +162,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="border-bottom"></div>
</div>
</div>
<div class="align-items-start mb-3 row">
<div class="col-12 col-md mb-2 pb-24">
{% include "common/components/navigation/buttons_toolbar.html" with item=asset %}
</div>
</div>
<div class="markdown-text"> <div class="markdown-text">
{% if asset.is_spoiler and not asset.is_free and not user_has_active_subscription %} {% if asset.is_spoiler and not asset.is_free and not user_has_active_subscription %}
{# do not show description to non-subscribers, if this is a subscription-only spoiler #} {# do not show description to non-subscribers, if this is a subscription-only spoiler #}