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 +10 -14
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d067302e8 - Show all commits

8
characters/templates/characters/characterversion_detail.html
View File

@ -12,7 +12,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="character-detail container py-2 py-md-3"> <div class="character-detail container page-detail-helper py-2 py-md-3">
<div class="row mb-3"> <div class="row mb-3">
<div class="col-lg-1"></div> <div class="col-lg-1"></div>
<div class="col-12 col-lg-10"> <div class="col-12 col-lg-10">
@ -81,18 +81,18 @@
{% include "common/components/cards/pill.html" with label='Free' %} {% include "common/components/cards/pill.html" with label='Free' %}
{% endif %} {% endif %}
{% if character_version.static_asset.license %} {% if character_version.static_asset.license %}
<a href="{{ character_version.static_asset.license.url }}" target="_blank" class="d-inline mx-2 text-muted" <a href="{{ character_version.static_asset.license.url }}" target="_blank" class="d-inline ms-3 text-muted text-nowrap"
data-bs-toggle="tooltip" data-placement="bottom" title="{{ character_version.static_asset.license.description }}"> data-bs-toggle="tooltip" data-placement="bottom" title="{{ character_version.static_asset.license.description }}">
<i class="i-info"></i> <i class="i-info"></i>
{{ character_version.static_asset.license }} {{ character_version.static_asset.license }}
</a> </a>
{% endif %} {% endif %}
<span class="d-inline me-2 text-muted" title="Blender version"> <span class="d-inline ms-3 text-muted text-nowrap" title="Blender version">
<i class="i-blender"></i> <i class="i-blender"></i>
Blender {{ character_version.min_blender_version }} Blender {{ character_version.min_blender_version }}
</span> </span>
{% if character.film %} {% if character.film %}
<a class="d-inline me-2 text-muted" href="{{ character.film.url }}"> <a class="d-inline ms-3 text-muted text-nowrap" href="{{ character.film.url }}">
<i class="i-reel"></i> <i class="i-reel"></i>
{{ character.film }} {{ character.film }}
</a> </a>

16
characters/templates/characters/components/card_character.html
View File

@ -17,23 +17,19 @@
{{ character.name }} {{ character.name }}
</h3> </h3>
<div class="cards-item-extra"> <div class="cards-item-extra">
{% if character_version.is_free %}
{% include "common/components/cards/pill.html" with class="me-3" label='Free' %}
{% endif %}
<ul> <ul>
{% if not character.is_published or not character_version.is_published %} {% if not character.is_published or not character_version.is_published %}
<li class="me-2"> <li class="me-3">
<span class="badge badge-danger"> <span class="badge badge-danger">
Unpublished Unpublished
</span> </span>
</li> </li>
{% endif %} {% endif %}
{% if character_version.is_free %}
<li class="me-2">
<span class="card-subtitle">
{% include "common/components/cards/pill.html" with label='Free' %}
</span>
</li>
{% endif %}
{% if character.likes.count > 0 %} {% if character.likes.count > 0 %}
<li class="me-2"> <li class="me-3">
<span class="card-subtitle"> <span class="card-subtitle">
{% if character.liked %} {% if character.liked %}
<i class="i-heart-filled"></i> <i class="i-heart-filled"></i>
@ -45,7 +41,7 @@
</li> </li>
{% endif %} {% endif %}
{% if character_version.comments.count > 0 %} {% if character_version.comments.count > 0 %}
<li class="me-2"> <li class="me-3">
<span class="card-subtitle"> <span class="card-subtitle">
<i class="i-comment"></i> <i class="i-comment"></i>
{{ character_version.comments.count }} {{ character_version.comments.count }}