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
3 changed files with 14 additions and 3 deletions
Showing only changes of commit ba6136b2ac - Show all commits

View File

@ -27,7 +27,6 @@ button,
&:not([class^="btn btn-"]), &:not([class^="btn btn-"]),
&[class^="btn btn-lg"] &[class^="btn btn-lg"]
--btn-color-bg: var(--color-bg-secondary) --btn-color-bg: var(--color-bg-secondary)
--btn-color-bg-hover: var(--color-text)
--btn-color: var(--color-text) --btn-color: var(--color-text)
&:active, &:active,
@ -139,6 +138,18 @@ a.cards-item-content
margin-bottom: 0 margin-bottom: 0
padding-bottom: var(--spacer-2) padding-bottom: var(--spacer-2)
/* Code. */
// TODO: move to web-assets
pre
+padding(3, y)
code
background-color: transparent
border: 0
font-size: var(--fs-base)
line-height: var(--lh-base)
white-space: pre-wrap
/* Deprecated. */ /* Deprecated. */
.btn-lg .btn-lg
padding-bottom: var(--spacer-2) !important padding-bottom: var(--spacer-2) !important

View File

@ -29,7 +29,7 @@
<div class="row"> <div class="row">
{% with form|add_form_classes:"sm" as form %} {% with form|add_form_classes:"sm" as form %}
<div class="col mt-2"> <div class="col mt-2">
<form class="form-group" enctype="multipart/form-data" method="post">{% csrf_token %} <form class="form-group flex-column align-items-start" enctype="multipart/form-data" method="post">{% csrf_token %}
{{ form.as_p }} {{ form.as_p }}
<div class="row"> <div class="row">
<div class="col"> <div class="col">

View File

@ -42,7 +42,7 @@
</div> </div>
<div class="button-toolbar justify-content-end"> <div class="button-toolbar justify-content-end">
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<a class="btn {% if training.favorited %}btn-primary{% endif %} save-button" data-favorite-url="{{ training.favorite_url }}" {% if training.favorited %}data-checked="checked" {% endif %} data-bs-toggle="tooltip" {% if training.favorited %}title="Save for later" {% else %}title=" Remove from saved for later" {% endif %}> <a class="btn {% if training.favorited %}btn-primary{% endif %} save-button" data-favorite-url="{{ training.favorite_url }}" {% if training.favorited %}data-checked="checked" {% endif %} data-bs-toggle="tooltip" {% if training.favorited %}title="Remove from saved for later" {% else %}title=" Save for later" {% endif %}>
<i class="i-{% if not training.favorited %}plus{% else %}check{% endif %}"></i> <i class="i-{% if not training.favorited %}plus{% else %}check{% endif %}"></i>
<span>{% if not training.favorited %}Save{% else %}Saved{% endif %}</span> <span>{% if not training.favorited %}Save{% else %}Saved{% endif %}</span>
</a> </a>