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 27 additions and 3 deletions
Showing only changes of commit 2bc73c8165 - Show all commits

View File

@ -5,8 +5,8 @@
{% include 'users/components/avatar.html' with user=request.user %} {% include 'users/components/avatar.html' with user=request.user %}
</div> </div>
<div class="col ps-0"> <div class="col ps-0">
{# TODO: migrate to form tags? #} {# TODO: migrate to form tags #}
<div class="comment-input-div form-control" contenteditable="true"></div> <div class="comment-input-div form-control js-comment-input-div-helper" contenteditable="true"></div>
</div> </div>
<div class="col comment-send d-flex flex-grow-0 lh-base ps-0"> <div class="col comment-send d-flex flex-grow-0 lh-base ps-0">
<button class="btn btn-input btn-primary"> <button class="btn btn-input btn-primary">

View File

@ -0,0 +1,24 @@
document.addEventListener('DOMContentLoaded', function() {
// TODO: remove function setCommentInputDivMaxWidth after forms have been migrated to native forms tags
function setCommentInputDivMaxWidth() {
setTimeout(function() {
const commentInputDivHelper = document.querySelectorAll('.js-comment-input-div-helper');
commentInputDivHelper.forEach(function(item) {
// Get item width within flex container
let itemWidth = item.offsetWidth;
// Set item max-width for multi-line comments
item.style.maxWidth = itemWidth + 'px';
});
}, 2000)
}
function init() {
setCommentInputDivMaxWidth();
window.addEventListener('resize', function() {
setCommentInputDivMaxWidth();
});
}
});

View File

@ -42,7 +42,7 @@
padding: var(--spacer-1) padding: var(--spacer-1)
.comment-input .comment-input
align-items: center align-items: start
display: flex display: flex
flex-direction: row flex-direction: row
+margin(2, bottom) +margin(2, bottom)