From 30144cc5354acd02945ff7f22f4065673a123127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 11 Mar 2024 15:18:10 +0100 Subject: [PATCH 01/48] Config: Init git submodule web-assets branch v2 upgrade --- .gitmodules | 1 + assets_shared | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9a6951e4..5907d2b6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "assets_shared"] path = assets_shared url = https://projects.blender.org/infrastructure/web-assets.git + branch = v2 diff --git a/assets_shared b/assets_shared index 719fff81..1fb928d6 160000 --- a/assets_shared +++ b/assets_shared @@ -1 +1 @@ -Subproject commit 719fff81dd9a941f7a3079df71a2a74b038a9144 +Subproject commit 1fb928d6f8697ddadc7d5dd7e159ba51ce92aa92 -- 2.30.2 From 6b6a71c69830673f66a57107689fe6d74f4f2abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 11 Mar 2024 15:31:59 +0100 Subject: [PATCH 02/48] Chore: Update git submodule web-assets branch v2 --- assets_shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets_shared b/assets_shared index 1fb928d6..6527140b 160000 --- a/assets_shared +++ b/assets_shared @@ -1 +1 @@ -Subproject commit 1fb928d6f8697ddadc7d5dd7e159ba51ce92aa92 +Subproject commit 6527140bbf1479171256d25d9afcd310ef897f17 -- 2.30.2 From 0622f388f4aa6afe198c2c0738276dab8e45d49f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 11 Mar 2024 15:35:32 +0100 Subject: [PATCH 03/48] Chore: Change post web-assets v2 upgrade style main imports --- common/static/common/styles/main.sass | 32 ++------------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/common/static/common/styles/main.sass b/common/static/common/styles/main.sass index 7b6c90c9..2934c5a3 100644 --- a/common/static/common/styles/main.sass +++ b/common/static/common/styles/main.sass @@ -7,36 +7,8 @@ $grid-breakpoints: (xs: 0,sm: 768px,md: 1020px,lg: 1220px,xl: 1380px,xxl: 1680px $container-max-widths: (sm: 760px, md: 1020px, lg: 1070px, xl: 1320px, xxl: 1600px) $container-width: map-get($container-max-widths, 'xl') -@import '../../../../assets_shared/src/styles/_media_queries.sass' -@import '../../../../assets_shared/src/styles/_mixins.sass' -@import '../../../../assets_shared/src/styles/_variables.sass' - -/* Import Bootstrap. */ -@import '../../../../assets_shared/src/styles/bootstrap/bootstrap.scss' - -@import '../../../../assets_shared/src/styles/_utilities.sass' -@import '../../../../assets_shared/src/styles/_fonts.sass' - -@import '../../../../assets_shared/src/styles/_bootstrap_overrides.sass' - -@import '../../../../assets_shared/src/styles/_alert.sass' -@import '../../../../assets_shared/src/styles/_badge.sass' -@import '../../../../assets_shared/src/styles/_base.sass' -@import '../../../../assets_shared/src/styles/_box.sass' -@import '../../../../assets_shared/src/styles/_button.sass' -@import '../../../../assets_shared/src/styles/_cards.sass' -@import '../../../../assets_shared/src/styles/_code.sass' -@import '../../../../assets_shared/src/styles/_details.sass' -@import '../../../../assets_shared/src/styles/_footer.sass' -@import '../../../../assets_shared/src/styles/_forms.sass' -@import '../../../../assets_shared/src/styles/_hero.sass' -@import '../../../../assets_shared/src/styles/_list.sass' -@import '../../../../assets_shared/src/styles/_navigation.sass' -@import '../../../../assets_shared/src/styles/_navigation_global.scss' -@import '../../../../assets_shared/src/styles/_pagination.sass' -@import '../../../../assets_shared/src/styles/_sidebar.sass' -@import '../../../../assets_shared/src/styles/_table.sass' -@import '../../../../assets_shared/src/styles/_type.sass' +/* Web Assets. */ +@import '../../../../assets_shared/src/styles/main.sass' /* Extension Platform specific styling. */ @import '_mixins.sass' -- 2.30.2 From 43ca92d5f9e8902adbb34e980894c634459e2416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 11 Mar 2024 15:58:52 +0100 Subject: [PATCH 04/48] Chore: Run post web-assets v2 upgrade script bash helper --- abuse/templates/abuse/abusereport_detail.html | 4 +- common/static/common/scripts/galleria.js | 4 +- common/static/common/styles/_activity.sass | 12 +-- common/static/common/styles/_badge.sass | 10 +- common/static/common/styles/_comments.sass | 6 +- common/static/common/styles/_extension.sass | 96 +++++++++---------- common/static/common/styles/_galleria.sass | 8 +- common/static/common/styles/_hero.sass | 4 +- common/static/common/styles/_list.sass | 10 +- common/static/common/styles/_utilities.sass | 10 +- common/static/common/styles/main.sass | 6 +- common/static/common/styles/tagger.scss | 4 +- common/templates/common/base.html | 2 +- .../static/extensions/scripts/manage.js | 12 +-- extensions/templates/extensions/base.html | 2 +- .../extensions/components/badge_support.html | 2 +- .../extensions/components/badge_tag.html | 2 +- .../templates/extensions/components/card.html | 4 +- extensions/templates/extensions/detail.html | 4 +- extensions/templates/extensions/home.html | 12 +-- extensions/templates/extensions/list.html | 4 +- .../manage/components/add_previews.html | 10 +- .../templates/extensions/manage/list.html | 2 +- .../templates/extensions/manage/update.html | 4 +- .../templates/extensions/version_list.html | 2 +- playbooks/templates/nginx/errors/5xx.html | 2 +- ratings/static/ratings/styles/_stars.sass | 4 +- .../templates/ratings/components/rating.html | 2 +- ratings/templates/ratings/rating_list.html | 2 +- .../components/review_list_item.html | 2 +- .../reviewers/extensions_review_detail.html | 6 +- users/templates/users/components/badges.html | 2 +- .../users/components/profile_display.html | 2 +- users/templates/users/settings/profile.html | 6 +- 34 files changed, 132 insertions(+), 132 deletions(-) diff --git a/abuse/templates/abuse/abusereport_detail.html b/abuse/templates/abuse/abusereport_detail.html index 3c21b754..fcba190c 100644 --- a/abuse/templates/abuse/abusereport_detail.html +++ b/abuse/templates/abuse/abusereport_detail.html @@ -24,7 +24,7 @@
{{ extension.name }}
-
+
{{ extension.get_type_display }} @@ -44,7 +44,7 @@ {% block hero_tabs %}
diff --git a/extensions/templates/extensions/home.html b/extensions/templates/extensions/home.html index f3afacf4..df8fc0b6 100644 --- a/extensions/templates/extensions/home.html +++ b/extensions/templates/extensions/home.html @@ -25,7 +25,7 @@ -
+
@@ -37,10 +37,10 @@

Add-ons

- See all + See all

Extend Blender capabilities with these add-ons by the community.

-
+
{% for extension in addons %} {% include "extensions/components/card.html" %} {% endfor %} @@ -52,12 +52,12 @@

Themes

- + See all

Blender themes to your liking. Dark, light, flat, colorful, and everything in between.

-
+
{% for extension in themes %} {% include "extensions/components/card.html" %} {% endfor %} @@ -65,7 +65,7 @@
Got an add-on or theme to share with the community? - + Upload diff --git a/extensions/templates/extensions/list.html b/extensions/templates/extensions/list.html index f3ce913b..dde2e7f5 100644 --- a/extensions/templates/extensions/list.html +++ b/extensions/templates/extensions/list.html @@ -35,7 +35,7 @@ {% endif %} {% if tag %}

- {% blocktranslate %}Extensions with the tag{% endblocktranslate %} + {% blocktranslate %}Extensions with the tag{% endblocktranslate %} {% include "extensions/components/badge_tag.html" %}

{% endif %} @@ -49,7 +49,7 @@
{% if object_list %} -
+
{% for extension in object_list %} {% include "extensions/components/card.html" with show_type=False %} {% endfor %} diff --git a/extensions/templates/extensions/manage/components/add_previews.html b/extensions/templates/extensions/manage/components/add_previews.html index c4bf3809..2555e7fe 100644 --- a/extensions/templates/extensions/manage/components/add_previews.html +++ b/extensions/templates/extensions/manage/components/add_previews.html @@ -2,17 +2,17 @@ {# Upload new preview images #} {% load i18n %}
-
+
{{ add_preview_formset.management_form }} {{ add_preview_formset.non_form_errors }} {% for newform in add_preview_formset %} {% with inlineform=newform|add_form_classes %}
-
+
- +
@@ -24,7 +24,7 @@ {% include "common/components/field.html" with field=inlineform.source label='File' %}
  • - +
@@ -38,7 +38,7 @@
- + {% trans 'Add Preview' %} diff --git a/extensions/templates/extensions/manage/list.html b/extensions/templates/extensions/manage/list.html index 6d6c07fc..d1380f9b 100644 --- a/extensions/templates/extensions/manage/list.html +++ b/extensions/templates/extensions/manage/list.html @@ -25,7 +25,7 @@
{% if object_list %} -
+
{% for extension in object_list %} {% include "extensions/manage/components/card.html" with show_type=True %} {% endfor %} diff --git a/extensions/templates/extensions/manage/update.html b/extensions/templates/extensions/manage/update.html index 21d077e7..4bc3785b 100644 --- a/extensions/templates/extensions/manage/update.html +++ b/extensions/templates/extensions/manage/update.html @@ -68,7 +68,7 @@ Source File -
  • +
  • {% include "common/components/field.html" with field=inlineform.DELETE %}
  • @@ -157,7 +157,7 @@ const previewDragContainer = document.querySelector('.js-previews-drag-container'); const previewDragClass = 'js-preview-drag'; -{% comment %} dragula([document.querySelector('.js-preview-drag'), document.querySelector('.cards-list')]); {% endcomment %} +{% comment %} dragula([document.querySelector('.js-preview-drag'), document.querySelector('.cards')]); {% endcomment %} dragula([previewDragContainer, previewDragContainer], { moves: function (el, container, handle) { return handle.className.includes(previewDragClass); diff --git a/extensions/templates/extensions/version_list.html b/extensions/templates/extensions/version_list.html index e312ec91..9dc77ee0 100644 --- a/extensions/templates/extensions/version_list.html +++ b/extensions/templates/extensions/version_list.html @@ -29,7 +29,7 @@ {% include "extensions/components/blender_version.html" with version=version %} -
      +
      • {{ version.file.size_bytes|filesizeformat }}
      • {{ version.download_count }}
      • diff --git a/playbooks/templates/nginx/errors/5xx.html b/playbooks/templates/nginx/errors/5xx.html index 876590c3..9f1a9ee4 100644 --- a/playbooks/templates/nginx/errors/5xx.html +++ b/playbooks/templates/nginx/errors/5xx.html @@ -32,7 +32,7 @@ h1 { background: linear-gradient(to right, #0cc, violet); background-clip: text; - -webkit-background-clip: text; + -webkit-bg-clip: text; -webkit-text-fill-color: transparent; font-weight: 300; font-size: 1.6em; diff --git a/ratings/static/ratings/styles/_stars.sass b/ratings/static/ratings/styles/_stars.sass index e4af307c..6fed36e8 100644 --- a/ratings/static/ratings/styles/_stars.sass +++ b/ratings/static/ratings/styles/_stars.sass @@ -87,9 +87,9 @@ text-decoration: none span - color: var(--text-color-secondary) + color: var(--color-text-secondary) display: block - font-size: var(--font-size-base) + font-size: var(--fs-base) .stars +margin(auto, x) diff --git a/ratings/templates/ratings/components/rating.html b/ratings/templates/ratings/components/rating.html index f9deb3a6..0675a644 100644 --- a/ratings/templates/ratings/components/rating.html +++ b/ratings/templates/ratings/components/rating.html @@ -14,7 +14,7 @@ {{ rating.user }}
        • -
      • +
      • {% with score_percentage=rating.score %} {% include "ratings/components/average.html" with score=rating.score %} diff --git a/ratings/templates/ratings/rating_list.html b/ratings/templates/ratings/rating_list.html index 8dfbb174..081a7606 100644 --- a/ratings/templates/ratings/rating_list.html +++ b/ratings/templates/ratings/rating_list.html @@ -13,7 +13,7 @@ {% endif %} {% if score %} -
        +
        See all
        {% endif %} diff --git a/reviewers/templates/reviewers/components/review_list_item.html b/reviewers/templates/reviewers/components/review_list_item.html index 0bbe5b15..3f86bc2a 100644 --- a/reviewers/templates/reviewers/components/review_list_item.html +++ b/reviewers/templates/reviewers/components/review_list_item.html @@ -18,7 +18,7 @@ {% if extension.review_activity.all %} - + {{ extension.review_activity.all.last.date_created|naturaltime_compact }} {% endif %} diff --git a/reviewers/templates/reviewers/extensions_review_detail.html b/reviewers/templates/reviewers/extensions_review_detail.html index 33ab0809..68497c91 100644 --- a/reviewers/templates/reviewers/extensions_review_detail.html +++ b/reviewers/templates/reviewers/extensions_review_detail.html @@ -24,7 +24,7 @@ {% trans "Version History" %} - +
        {% if is_maintainer %} @@ -137,7 +137,7 @@ {{ activity.user }}
        • -
      • +
      • {{ activity.date_created|naturaltime_compact }} @@ -165,7 +165,7 @@ {% include "common/components/field.html" with field=form.message %}
        -
        +
        {% if is_maintainer or request.user.is_moderator %} {% include "common/components/field.html" with field=form.type %} {% endif %} diff --git a/users/templates/users/components/badges.html b/users/templates/users/components/badges.html index 0cb04ca3..bec45ba0 100644 --- a/users/templates/users/components/badges.html +++ b/users/templates/users/components/badges.html @@ -1,3 +1,3 @@ {% for _slug, badge in badges.items %} - + {% endfor %} diff --git a/users/templates/users/components/profile_display.html b/users/templates/users/components/profile_display.html index 40ce9a9a..26e1d70c 100644 --- a/users/templates/users/components/profile_display.html +++ b/users/templates/users/components/profile_display.html @@ -1,7 +1,7 @@ {% load static %} {% if show_name %} - + {% firstof user.full_name user.username %} {% endif %} diff --git a/users/templates/users/settings/profile.html b/users/templates/users/settings/profile.html index 2f08fa73..6d0c3e67 100644 --- a/users/templates/users/settings/profile.html +++ b/users/templates/users/settings/profile.html @@ -27,12 +27,12 @@
        -- 2.30.2 From c096a8eec2c2cd8cff21cbc48dd2cd3d14428aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 11 Mar 2024 17:36:53 +0100 Subject: [PATCH 05/48] UI: Add style navigation global post web-assets v2 upgrade changes --- .../common/styles/_navigation_global.sass | 17 +++++++++++++++++ common/static/common/styles/main.sass | 1 + common/templates/common/base.html | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 common/static/common/styles/_navigation_global.sass diff --git a/common/static/common/styles/_navigation_global.sass b/common/static/common/styles/_navigation_global.sass new file mode 100644 index 00000000..78e926e7 --- /dev/null +++ b/common/static/common/styles/_navigation_global.sass @@ -0,0 +1,17 @@ +.nav-global + --nav-global-border-radius: var(--border-radius) + --nav-global-border-radius-lg: var(--border-radius-lg) + --nav-global-button-height: calc(var(--spacer) * 2.5) + --nav-global-font-size: var(--fs-sm) + --nav-global-link-padding-y: var(--nav-global-spacer-xs); + --nav-global-navbar-height: var(--navbar-primary-height, var(--spacer-6)); + --nav-global-spacer: var(--spacer) + --nav-global-spacer-sm: var(--spacer-2) + --nav-global-spacer-xs: var(--spacer-1) + + .btn-primary + color: var(--color-accent) !important + + input, + .form-control + height: var(--nav-global-button-height) diff --git a/common/static/common/styles/main.sass b/common/static/common/styles/main.sass index ab99707a..cc231aa4 100644 --- a/common/static/common/styles/main.sass +++ b/common/static/common/styles/main.sass @@ -26,6 +26,7 @@ $container-width: map-get($container-max-widths, 'xl') @import '_galleria.sass' @import '_hero.sass' @import '_list.sass' +@import '_navigation_global.sass' @import '_table.sass' @import 'ratings/static/ratings/styles/_review.sass' @import 'ratings/static/ratings/styles/_stars.sass' diff --git a/common/templates/common/base.html b/common/templates/common/base.html index 537dcaa4..c860f740 100644 --- a/common/templates/common/base.html +++ b/common/templates/common/base.html @@ -125,7 +125,7 @@ {% block nav-upload %}
      • - + Upload Extension -- 2.30.2 From 21c8b1b823c7072e61de237e981f21d7541e7445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 11 Mar 2024 18:29:06 +0100 Subject: [PATCH 06/48] UI: Add style extension detail aside post web-assets v2 upgrade changes --- common/static/common/styles/_cards.sass | 3 +++ common/static/common/styles/_extension.sass | 1 + common/static/common/styles/_list.sass | 9 +++++++++ common/static/common/styles/main.sass | 1 + 4 files changed, 14 insertions(+) create mode 100644 common/static/common/styles/_cards.sass diff --git a/common/static/common/styles/_cards.sass b/common/static/common/styles/_cards.sass new file mode 100644 index 00000000..1da1e36d --- /dev/null +++ b/common/static/common/styles/_cards.sass @@ -0,0 +1,3 @@ +.card + @extend .box + diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index 7dbcb869..5b329acd 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -95,6 +95,7 @@ dt color: var(--color-text-secondary) font-size: var(--fs-sm) + line-height: calc(24 / 14) dd font-family: var(--font-family-body) diff --git a/common/static/common/styles/_list.sass b/common/static/common/styles/_list.sass index ff6db7c0..5a50db3b 100644 --- a/common/static/common/styles/_list.sass +++ b/common/static/common/styles/_list.sass @@ -1,6 +1,15 @@ +.dl-col + margin-bottom: -.1rem // Compensate border-bottom height + .dl-col-2 flex-grow: 2 +.dl-row + +padding(2, bottom) + + &:first-child + +padding(0, top) + .list-filters +box-card background-color: var(--color-bg-tertiary) diff --git a/common/static/common/styles/main.sass b/common/static/common/styles/main.sass index cc231aa4..b49e260f 100644 --- a/common/static/common/styles/main.sass +++ b/common/static/common/styles/main.sass @@ -18,6 +18,7 @@ $container-width: map-get($container-max-widths, 'xl') @import '_alert.sass' @import '_badge.sass' @import '_box.sass' +@import '_cards.sass' @import '_code.sass' @import '_comments.sass' @import '_extension.sass' -- 2.30.2 From ced22901c4ba5a5130c9811eaa3e37b4e29d090e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Fri, 19 Apr 2024 16:38:12 +0200 Subject: [PATCH 07/48] Chore: Update git submodule web-assets to v2.0.0-alpha.7 --- assets_shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets_shared b/assets_shared index 6527140b..69ac038a 160000 --- a/assets_shared +++ b/assets_shared @@ -1 +1 @@ -Subproject commit 6527140bbf1479171256d25d9afcd310ef897f17 +Subproject commit 69ac038afd6b9312a9c715b44b7814b0cbdcf572 -- 2.30.2 From d3b885ab272176d4483b32d2458cc4aa27ca00fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 15:27:28 +0200 Subject: [PATCH 08/48] UI: Fix post web-assets v2 upgrade stars vertical spacings --- common/static/common/styles/_extension.sass | 1 + extensions/templates/extensions/components/card.html | 2 +- extensions/templates/extensions/detail.html | 2 +- ratings/static/ratings/styles/_stars.sass | 1 + ratings/templates/ratings/components/average.html | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index 5b329acd..0c6ad29e 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -278,6 +278,7 @@ align-items: center color: var(--color-text-secondary) font-size: var(--fs-sm) + line-height: var(--lh-sm) margin: auto 0 0 0 &+.ext-list-details diff --git a/extensions/templates/extensions/components/card.html b/extensions/templates/extensions/components/card.html index 960cf4a1..0ef059e1 100644 --- a/extensions/templates/extensions/components/card.html +++ b/extensions/templates/extensions/components/card.html @@ -33,7 +33,7 @@
          {% if extension.average_score %}
        • - + {% include "ratings/components/average.html" with score=extension.average_score %} ({{ extension.text_ratings_count|int_compact }}) diff --git a/extensions/templates/extensions/detail.html b/extensions/templates/extensions/detail.html index 5b99e5f3..85c8f122 100644 --- a/extensions/templates/extensions/detail.html +++ b/extensions/templates/extensions/detail.html @@ -129,7 +129,7 @@
          {% trans 'Rating' %}
          {% if extension.average_score %} - + {% include "ratings/components/average.html" with score=extension.average_score %} ({{ extension.ratings.listed.count }}) diff --git a/ratings/static/ratings/styles/_stars.sass b/ratings/static/ratings/styles/_stars.sass index 6fed36e8..7811fcfa 100644 --- a/ratings/static/ratings/styles/_stars.sass +++ b/ratings/static/ratings/styles/_stars.sass @@ -51,6 +51,7 @@ -webkit-mask-size: var(--star-size) var(--star-size) mask-size: var(--star-size) var(--star-size) text-align: left + transform: translateY(-.2rem) width: var(--stars-number) span diff --git a/ratings/templates/ratings/components/average.html b/ratings/templates/ratings/components/average.html index 8593824f..dc38b0da 100644 --- a/ratings/templates/ratings/components/average.html +++ b/ratings/templates/ratings/components/average.html @@ -2,6 +2,6 @@ {% blocktranslate asvar title with score=score %}Rated {{ score }} out of 5{% endblocktranslate %} - + -- 2.30.2 From 75c389634ae2b63d31d20c5d425aea30b1ed60a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 15:46:49 +0200 Subject: [PATCH 09/48] UI: Fix post web-assets v2 upgrade forms checkbox layout --- common/static/common/styles/_forms.sass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/common/static/common/styles/_forms.sass b/common/static/common/styles/_forms.sass index 162dedda..287cdf89 100644 --- a/common/static/common/styles/_forms.sass +++ b/common/static/common/styles/_forms.sass @@ -1,3 +1,14 @@ +.form-check-input, +.form-check-label + &:hover + cursor: pointer + +.form-check-input + height: var(--spacer-4) + +.form-check-label + +margin(2, left) + /* Override Tagger's styling. */ .was-validated .form-control:invalid, .form-control.is-invalid -- 2.30.2 From f9975ce593599f12fb66e786e32cc15d6134a1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 15:59:07 +0200 Subject: [PATCH 10/48] UI: Fix post web-assets v2 upgrade component extension edit_detail_card layout --- .../extensions/components/extension_edit_detail_card.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/templates/extensions/components/extension_edit_detail_card.html b/extensions/templates/extensions/components/extension_edit_detail_card.html index d5ff91fe..85b30b5e 100644 --- a/extensions/templates/extensions/components/extension_edit_detail_card.html +++ b/extensions/templates/extensions/components/extension_edit_detail_card.html @@ -2,7 +2,7 @@ {# Info Summary #}
          -
          +
          {% if is_initial %}
          Information retrieved from manifest -- 2.30.2 From 69c7c7d655cc7e4615f5e250178fe8557ccf585a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 16:05:21 +0200 Subject: [PATCH 11/48] UI: Improve post web-assets v2 upgrade component add_previews layout --- common/static/common/styles/_extension.sass | 2 +- .../manage/components/add_previews.html | 58 +++++++++---------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index 0c6ad29e..912310ee 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -328,7 +328,7 @@ border-radius: var(--border-radius-lg) border: var(--border-width) solid var(--border-color) display: flex - +padding(1, y) + +padding(2, y) .previews-list-item-thumbnail margin: 0 diff --git a/extensions/templates/extensions/manage/components/add_previews.html b/extensions/templates/extensions/manage/components/add_previews.html index 2555e7fe..8a41d1f2 100644 --- a/extensions/templates/extensions/manage/components/add_previews.html +++ b/extensions/templates/extensions/manage/components/add_previews.html @@ -1,40 +1,38 @@ {% load common %} {# Upload new preview images #} {% load i18n %} -
          -
          - {{ add_preview_formset.management_form }} - {{ add_preview_formset.non_form_errors }} - {% for newform in add_preview_formset %} - {% with inlineform=newform|add_form_classes %} -
          -
          -
          -
          -
          - -
          -
          -
          -
          -
          - {% include "common/components/field.html" with field=inlineform.caption label='Caption' %} -
          -
          - {% include "common/components/field.html" with field=inlineform.source label='File' %} -
            -
          • - -
            • -
          +
          + {{ add_preview_formset.management_form }} + {{ add_preview_formset.non_form_errors }} + {% for newform in add_preview_formset %} + {% with inlineform=newform|add_form_classes %} +
          +
          +
          +
          +
          +
          +
          +
          + {% include "common/components/field.html" with field=inlineform.caption label='Caption' %} +
          +
          + {% include "common/components/field.html" with field=inlineform.source label='File' %} +
            +
          • + +
            • +
          +
          +
          - {{ inlineform.non_form_errors }} - {% endwith %} - {% endfor %} -
          +
          + {{ inlineform.non_form_errors }} + {% endwith %} + {% endfor %}
          -- 2.30.2 From ef6af9fb9da4adc2bfae56523732e4789a715118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 16:07:38 +0200 Subject: [PATCH 12/48] UI: Change template draft_finalise btn save draft type --- extensions/templates/extensions/draft_finalise.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/templates/extensions/draft_finalise.html b/extensions/templates/extensions/draft_finalise.html index 989282d0..71cef67c 100644 --- a/extensions/templates/extensions/draft_finalise.html +++ b/extensions/templates/extensions/draft_finalise.html @@ -82,7 +82,7 @@
          - -- 2.30.2 From 3ec67bdfd5c90907e4ec9bf90a23cccf9f0c42bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 16:11:46 +0200 Subject: [PATCH 13/48] UI: Improve post web-assets v2 upgrade style form-control type file height --- common/static/common/styles/_forms.sass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/static/common/styles/_forms.sass b/common/static/common/styles/_forms.sass index 287cdf89..0cf8ddc9 100644 --- a/common/static/common/styles/_forms.sass +++ b/common/static/common/styles/_forms.sass @@ -9,6 +9,10 @@ .form-check-label +margin(2, left) +.form-control + &[type="file"] + height: calc(var(--spacer) * 2.5) + /* Override Tagger's styling. */ .was-validated .form-control:invalid, .form-control.is-invalid -- 2.30.2 From fd1a36b3d00fabe277cde63f9a2aa674909afdca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 16:32:42 +0200 Subject: [PATCH 14/48] UI: Improve style ext detail description pre vertical spacing --- common/static/common/styles/_extension.sass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index 912310ee..5b51fbe1 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -81,6 +81,9 @@ +padding(4) +style-rich-text + pre + +margin(3, bottom) + .ext-detail-info dd color: var(--color-text) -- 2.30.2 From 0a8baa76b04d721d3911bf932bfcf102824fcdde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 16:36:18 +0200 Subject: [PATCH 15/48] UI: Fix post web-assets v2 upgrade badges sizings --- extensions/templates/extensions/components/badge_tag.html | 2 +- users/templates/users/settings/profile.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/templates/extensions/components/badge_tag.html b/extensions/templates/extensions/components/badge_tag.html index f22d95d7..46d5d001 100644 --- a/extensions/templates/extensions/components/badge_tag.html +++ b/extensions/templates/extensions/components/badge_tag.html @@ -1,6 +1,6 @@ {% load extensions %} + class="badge badge-tag{% if not small %} badge-lg{% endif %} {{ class }}"> {{ tag.name }} diff --git a/users/templates/users/settings/profile.html b/users/templates/users/settings/profile.html index d44429a2..cf97b900 100644 --- a/users/templates/users/settings/profile.html +++ b/users/templates/users/settings/profile.html @@ -30,9 +30,9 @@ Email {% if user.confirmed_email_at %} - Confirmed + Confirmed {% else %} - Not yet confirmed + Not yet confirmed {% endif %}
          -- 2.30.2 From c9450a9232c28fbd9c498c6c384e4546a67e4bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 16:54:33 +0200 Subject: [PATCH 16/48] UI: Fix post web-assets v2 upgrade style utiltity color-accent --- common/static/common/styles/_utilities.sass | 7 +++++++ extensions/templates/extensions/home.html | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/common/static/common/styles/_utilities.sass b/common/static/common/styles/_utilities.sass index 20632c78..472bec38 100644 --- a/common/static/common/styles/_utilities.sass +++ b/common/static/common/styles/_utilities.sass @@ -36,6 +36,13 @@ .show opacity: 1 +.text-accent + color: var(--color-accent) + +a.text-accent + &:hover + color: var(--color-accent) + .text-underline text-decoration: underline !important diff --git a/extensions/templates/extensions/home.html b/extensions/templates/extensions/home.html index df8fc0b6..4ec27e74 100644 --- a/extensions/templates/extensions/home.html +++ b/extensions/templates/extensions/home.html @@ -65,7 +65,7 @@
          Got an add-on or theme to share with the community? - + Upload -- 2.30.2 From 3900a6c7180f2cc695d7b3aea59aa09c32d4102e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 17:02:22 +0200 Subject: [PATCH 17/48] UI: Improve post web-assets upgrade v2 site-release-badge positon --- common/static/common/styles/main.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/static/common/styles/main.sass b/common/static/common/styles/main.sass index 7294ff7a..b38ead58 100644 --- a/common/static/common/styles/main.sass +++ b/common/static/common/styles/main.sass @@ -77,7 +77,7 @@ $container-width: map-get($container-max-widths, 'xl') padding-block: .1rem padding-inline: .4rem position: absolute - top: -.4rem + top: calc(var(--spacer-2) * -1) transition: background-color var(--transition-speed), box-shadow 500ms, color var(--transition-speed) right: -.5rem -- 2.30.2 From f7f84aeeebe22f9fc130e59591fcf999686114b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 17:45:59 +0200 Subject: [PATCH 18/48] Chore: Run post web-assets v2 upgrade script bash helper units conversion and cleanup Run post web-assets v2 upgrade script bash helper for converting sizes and units to new rem sizing, and implement 4 px based sizing. --- common/static/common/styles/_activity.sass | 14 +++++------ common/static/common/styles/_comments.sass | 10 ++++---- common/static/common/styles/_extension.sass | 26 ++++++++++----------- common/static/common/styles/_galleria.sass | 26 ++++++++++----------- common/static/common/styles/_hero.sass | 4 ++-- common/static/common/styles/main.sass | 2 +- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/common/static/common/styles/_activity.sass b/common/static/common/styles/_activity.sass index d62c259a..bd1dc2b9 100644 --- a/common/static/common/styles/_activity.sass +++ b/common/static/common/styles/_activity.sass @@ -16,7 +16,7 @@ &:last-child /* Remove bottom half of the vertical line for last item. */ .comment-card:before - height: calc(50% - 1rem) + height: calc(50% - 1.6rem) .activity-status-change:before height: calc(50% + var(--border-width)) @@ -50,7 +50,7 @@ left: var(--border-width) position: absolute top: 50% - width: 2rem + width: 3.2rem z-index: -1 .profile-avatar @@ -59,9 +59,9 @@ .comment-card &:after - top: 2rem + top: 3.2rem .activity-icon - top: 1.25rem + top: 2.0rem .activity-status-change color: var(--color-text-tertiary) @@ -83,7 +83,7 @@ &.activity-status-approved .activity-icon border-color: var(--color-success) - box-shadow: 0 0 1rem var(--color-success-bg) + box-shadow: 0 0 1.6rem var(--color-success-bg) color: var(--color-success-text) .activity-icon @@ -94,11 +94,11 @@ color: var(--color-text-tertiary) display: flex font-size: var(--fs-sm) - height: 1.5rem + height: 1.8rem justify-content: center left: -.66rem position: absolute - width: 1.5rem + width: 1.8rem /* Comment form */ .comment-form diff --git a/common/static/common/styles/_comments.sass b/common/static/common/styles/_comments.sass index 29f47af5..f5989017 100644 --- a/common/static/common/styles/_comments.sass +++ b/common/static/common/styles/_comments.sass @@ -12,15 +12,15 @@ &:before background-color: var(--box-bg-color) - border-radius: .25rem + border-radius: .4rem content: '' display: block - height: 1rem + height: 1.6rem left: -.33rem position: absolute rotate: 45deg - top: 1rem - width: 1rem + top: 1.6rem + width: 1.6rem z-index: -1 p:last-child @@ -35,7 +35,7 @@ align-items: center display: flex +list-unstyled - gap: 1rem + gap: 1.6rem margin: 0 aside diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index 5b51fbe1..bbed5613 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -1,14 +1,14 @@ .hero.extension-detail --hero-max-height: 0 - --hero-min-height: 240px - --fs-hero-title: clamp(3rem, 4vw + 1rem, 48px) - --fs-lg: 18px - --border-width: 2px + --hero-min-height: 24.0rem + --fs-hero-title: clamp(4.8rem, 4vw + 1.6rem, 4.8rem) + --fs-lg: 1.8rem + --border-width: .2rem --hero-bg-color: hsl(213, 10%, 14%) background-color: var(--hero-bg-color) background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='40' height='40' viewBox='0 0 40 40'%3E%3Cg fill-rule='evenodd'%3E%3Cg fill='%233e4248' fill-opacity='0.21'%3E%3Cpath d='M0 38.59l2.83-2.83 1.41 1.41L1.41 40H0v-1.41zM0 1.4l2.83 2.83 1.41-1.41L1.41 0H0v1.41zM38.59 40l-2.83-2.83 1.41-1.41L40 38.59V40h-1.41zM40 1.41l-2.83 2.83-1.41-1.41L38.59 0H40v1.41zM20 18.6l2.83-2.83 1.41 1.41L21.41 20l2.83 2.83-1.41 1.41L20 21.41l-2.83 2.83-1.41-1.41L18.59 20l-2.83-2.83 1.41-1.41L20 18.59z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E") - background-size: 40px + background-size: 4.0rem flex-direction: column overflow: initial text-shadow: none @@ -27,7 +27,7 @@ background-image: linear-gradient(0deg, var(--color-bg), hsla(213, 10%, 14%, 0)) &.extension-review - --hero-min-height: 210px + --hero-min-height: 21.0rem .ext-detail-download-danger background-color: var(--color-danger-bg) @@ -149,7 +149,7 @@ +padding(2, y) .btn-accent - box-shadow: 2px 5px 5px rgba(0,82,255,.102), 1px 10px 15px rgba(0,82,255,.102), 2px 10px 30px rgba(0,82,255,.349) + box-shadow: .2rem .8rem .8rem rgba(0,82,255,.102), 1.6rem 1.0rem 1.8rem rgba(0,82,255,.102), 3.2rem 1.0rem 3.2rem rgba(0,82,255,.349) .btn-install-drag, .btn-install-drag:active @@ -184,7 +184,7 @@ transition: box-shadow ease-in-out 1s &:hover - box-shadow: 10px 10px 20px 0px rgba(0, 0, 0, .04), -10px 0 20px 0px rgba(0, 0, 0, .04) + box-shadow: 1.0rem 1.0rem 2.0rem 0px rgba(0, 0, 0, .04), -1.0rem 0 2.0rem 0px rgba(0, 0, 0, .04) &.is-bg-blur background-color: hsl(213, 10%, 21%) @@ -217,7 +217,7 @@ +margin(3, bottom) .ext-card-thumbnail - --card-thumbnail-width: 240px + --card-thumbnail-width: 24.0rem border-top-right-radius: 0 border-bottom-left-radius: var(--border-radius-lg) height: 100% @@ -231,7 +231,7 @@ .ext-card-thumbnail-blur bottom: 0 - filter: blur(50px) + filter: blur(5.0rem) left: 0 position: absolute right: 0 @@ -290,7 +290,7 @@ .ext-card-tags display: flex flex-wrap: wrap - gap: .25rem + gap: 3.2rem justify-content: flex-start /* Show only on row list view.*/ @@ -321,7 +321,7 @@ .previews-list display: flex flex-direction: column - gap: .5rem + gap: .8rem .previews-list-item --preview-thumbnail-max-size: 180px @@ -381,7 +381,7 @@ @extend .list-inline color: var(--color-text-secondary) +fw-normal - gap: 0 1rem + gap: 0 1.6rem margin: 0 +margin(3, right) diff --git a/common/static/common/styles/_galleria.sass b/common/static/common/styles/_galleria.sass index 1eceb1ef..b01828dd 100644 --- a/common/static/common/styles/_galleria.sass +++ b/common/static/common/styles/_galleria.sass @@ -1,5 +1,5 @@ .galleria-container - --extension-thumbnail-width: 140px + --extension-thumbnail-width: 14.0rem background-color: var(--color-bg-secondary) border-radius: var(--border-radius-lg) @@ -12,7 +12,7 @@ .galleria-items display: flex - gap: .5rem + gap: .8rem overflow-x: auto +padding(2, top) scroll-behavior: smooth @@ -25,7 +25,7 @@ display: none &::-webkit-scrollbar - height: 10px + height: 1.0rem width: 100% &::-webkit-scrollbar-thumb @@ -43,7 +43,7 @@ .galleria-item-type-video &::after - font-size: 2rem + font-size: 3.2rem .galleria-item +border-radius @@ -69,14 +69,14 @@ transform: translate(-50%, -50%) width: initial height: initial - gap: 1rem + gap: 1.6rem &.is-active background-color: var(--color-accent) img - clip-path: inset(0.2rem 0.2rem 0.2rem 0.2rem) + clip-path: inset(.2rem .2rem .2rem .2rem) img clip-path: inset(0 0 0 0) @@ -92,7 +92,7 @@ color: white content: '\e83e' font-family: 'fontutti' - font-size: 4rem + font-size: 5.6rem left: 50% top: 50% pointer-events: none @@ -120,7 +120,7 @@ background: transparent border: none cursor: pointer - font-size: 4rem + font-size: 5.6rem height: 100vh max-width: 200px opacity: .6 @@ -143,7 +143,7 @@ &.btn-close fill: white - font-size: 2rem + font-size: 3.2rem height: 20vh max-height: 80px max-width: 80px @@ -174,7 +174,7 @@ .indicator background-color: rgba(black, .5) - bottom: 1rem + bottom: 1.6rem color: white +fw-bold min-width: 3ch @@ -184,10 +184,10 @@ text-align: right .caption - backdrop-filter: blur(25px) + backdrop-filter: blur(2.8rem) background-color: rgba(black, .5) border-radius: var(--border-radius) - bottom: 1rem + bottom: 1.6rem color: white +font-weight(500) line-height: 1.5 @@ -195,7 +195,7 @@ +padding(2, x) position: absolute text-align: center - text-shadow: 1px 1px 0 black, 2px 2px 3px rgba(black, .5) + text-shadow: .1rem .1rem 0 black, .2rem .2rem rgba(black, .5) body.is-galleria-active overflow: hidden diff --git a/common/static/common/styles/_hero.sass b/common/static/common/styles/_hero.sass index 4426a783..0bb42568 100644 --- a/common/static/common/styles/_hero.sass +++ b/common/static/common/styles/_hero.sass @@ -4,7 +4,7 @@ &.is-flatpage --hero-max-height: 0 - --hero-min-height: 240px + --hero-min-height: 24.0rem background: transparent .hero-content @@ -32,7 +32,7 @@ &::after background-color: currentColor - bottom: -1px + bottom: -.1rem content: '' height: var(--border-width) left: 0 diff --git a/common/static/common/styles/main.sass b/common/static/common/styles/main.sass index b38ead58..40da67cc 100644 --- a/common/static/common/styles/main.sass +++ b/common/static/common/styles/main.sass @@ -52,7 +52,7 @@ $container-width: map-get($container-max-widths, 'xl') .profile-avatar border-radius: 50% pointer-events: none - width: 26px + width: 2.6rem .search-highlight background-color: var(--btn-color-bg) -- 2.30.2 From 32131a10ce0b39fa13f0f8b784be49b3cb37f36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Mon, 22 Apr 2024 18:02:45 +0200 Subject: [PATCH 19/48] UI: Improve post web-assets upgrade v2 cards p vertical spacing --- common/static/common/styles/_extension.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index bbed5613..8edbcc8d 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -265,7 +265,7 @@ +padding(3) p - line-height: 1.2 + line-height: calc(24 / 18) .ext-card-title font-size: var(--fs-lg) -- 2.30.2 From d03d345d2b648baaf8445b9a00f672d9d667726b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 14:21:50 +0200 Subject: [PATCH 20/48] UI: Fix post web-assets upgrade v2 style activity icons position --- common/static/common/styles/_activity.sass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/common/static/common/styles/_activity.sass b/common/static/common/styles/_activity.sass index bd1dc2b9..6323e572 100644 --- a/common/static/common/styles/_activity.sass +++ b/common/static/common/styles/_activity.sass @@ -53,6 +53,9 @@ width: 3.2rem z-index: -1 + .activity-icon + top: 1.2rem + .profile-avatar border: var(--border-width) solid var(--border-color) background-color: var(--border-color) @@ -60,8 +63,9 @@ .comment-card &:after top: 3.2rem + .activity-icon - top: 2.0rem + top: 2.2rem .activity-status-change color: var(--color-text-tertiary) @@ -94,11 +98,11 @@ color: var(--color-text-tertiary) display: flex font-size: var(--fs-sm) - height: 1.8rem + height: var(--spacer-4) justify-content: center left: -.66rem position: absolute - width: 1.8rem + width: var(--spacer-4) /* Comment form */ .comment-form -- 2.30.2 From f881a655c95db401abbd066a0f6d266df584cc58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 14:22:28 +0200 Subject: [PATCH 21/48] UI: Improve post web-assets upgrade v2 style details padding --- common/static/common/styles/_extension.sass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index 8edbcc8d..9ece1285 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -390,9 +390,12 @@ +fw-normal +margin(3, left) - details[open] - .show-on-collapse - display: none + details + padding: 0 + + &[open] + .show-on-collapse + display: none .ext-detail-info .ext-detail-permissions -- 2.30.2 From f651cb01e4bf4c5743899ad9b1858997788612e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 14:23:01 +0200 Subject: [PATCH 22/48] UI: Improve post web-assets upgrade v2 style profile-avatar sizing --- common/static/common/styles/main.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/static/common/styles/main.sass b/common/static/common/styles/main.sass index 40da67cc..970ae15f 100644 --- a/common/static/common/styles/main.sass +++ b/common/static/common/styles/main.sass @@ -51,8 +51,8 @@ $container-width: map-get($container-max-widths, 'xl') .profile-avatar border-radius: 50% + height: var(--spacer-4) pointer-events: none - width: 2.6rem .search-highlight background-color: var(--btn-color-bg) -- 2.30.2 From de847a348da8e36f9f24d2180f59173af21a5789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 14:24:41 +0200 Subject: [PATCH 23/48] UI: Improve style activity comment-form btn submit sizing --- common/static/common/styles/_activity.sass | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/static/common/styles/_activity.sass b/common/static/common/styles/_activity.sass index 6323e572..33238566 100644 --- a/common/static/common/styles/_activity.sass +++ b/common/static/common/styles/_activity.sass @@ -116,9 +116,6 @@ select width: auto - button[type="submit"] - min-width: 50% - textarea height: calc(var(--spacer) * 8) max-height: 0 -- 2.30.2 From 952ffc484cc6146cd84a2845612d5eab07cfc0f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 14:43:03 +0200 Subject: [PATCH 24/48] Fix: Fix style cards tags gaps horizontal layout --- common/static/common/styles/_extension.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index 9ece1285..f68a68c6 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -290,7 +290,7 @@ .ext-card-tags display: flex flex-wrap: wrap - gap: 3.2rem + gap: var(--spacer-1) justify-content: flex-start /* Show only on row list view.*/ -- 2.30.2 From 1d7fb4e9869ace5d1b7c0b2c281694bab3d68a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 14:53:09 +0200 Subject: [PATCH 25/48] UI: Add template detail condition check if description exists --- extensions/templates/extensions/detail.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/extensions/templates/extensions/detail.html b/extensions/templates/extensions/detail.html index 85c8f122..bcdbfd05 100644 --- a/extensions/templates/extensions/detail.html +++ b/extensions/templates/extensions/detail.html @@ -23,11 +23,13 @@ {# Description #} {% block extension_description %} -
          -
          - {{ extension.description|markdown }} -
          -
          + {% if extension.description %} +
          +
          + {{ extension.description|markdown }} +
          +
          + {% endif %} {% endblock extension_description %} {# What's New #} -- 2.30.2 From 38d60a5939bf32acc4b52d8b7b3078c47909a0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 15:06:03 +0200 Subject: [PATCH 26/48] UI: Improve component add_previews thumbnail sizing to match fields height --- common/static/common/styles/_extension.sass | 7 +++++-- .../extensions/manage/components/add_previews.html | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index f68a68c6..8d80e1c2 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -324,9 +324,9 @@ gap: .8rem .previews-list-item - --preview-thumbnail-max-size: 180px + --preview-thumbnail-max-size: calc(12.4rem * 16 / 9) - align-items: center + align-items: start background-color: border-radius: var(--border-radius-lg) border: var(--border-width) solid var(--border-color) @@ -335,6 +335,7 @@ .previews-list-item-thumbnail margin: 0 + +margin(2, top) width: var(--preview-thumbnail-max-size) .previews-list-item-thumbnail-img @@ -342,6 +343,7 @@ background-position: center background-size: cover border-radius: var(--border-radius) + height: 12.4rem +make-aspect-ratio('16x9') .details @@ -350,6 +352,7 @@ label font-size: var(--fs-sm) + line-height: var(--lh-sm) ul +list-unstyled diff --git a/extensions/templates/extensions/manage/components/add_previews.html b/extensions/templates/extensions/manage/components/add_previews.html index 8a41d1f2..c045ffab 100644 --- a/extensions/templates/extensions/manage/components/add_previews.html +++ b/extensions/templates/extensions/manage/components/add_previews.html @@ -8,7 +8,7 @@ {% with inlineform=newform|add_form_classes %}
          -
          +
          -- 2.30.2 From 9d4d248ebd1cb10a70c1342f11ba3b10d221fcfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 15:26:59 +0200 Subject: [PATCH 27/48] UI: Add style rating-form select set stars colours to warning --- common/static/common/styles/_extension.sass | 9 +++++++++ ratings/templates/ratings/rating_form.html | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index 8d80e1c2..e5a8b00e 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -467,3 +467,12 @@ .ext-review-list-activity display: flex +padding(0, x) + +.rating-form + select + color: var(--color-warning) + + &:active, + &:hover, + &:focus + color: var(--color-warning) diff --git a/ratings/templates/ratings/rating_form.html b/ratings/templates/ratings/rating_form.html index 79e8857f..3358b2b3 100644 --- a/ratings/templates/ratings/rating_form.html +++ b/ratings/templates/ratings/rating_form.html @@ -4,7 +4,7 @@ {% block page_title %}Rate {{ extension.name }}{% endblock page_title %} {% block content %} -
          +
          {% csrf_token %} {% with form=form|add_form_classes %} -- 2.30.2 From 1099d4066413036b221b5e34cc5327718101348b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 15:30:23 +0200 Subject: [PATCH 28/48] UI: Improve style extensions previews-list-item-thumbnail vertical spacing --- common/static/common/styles/_extension.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index e5a8b00e..92243998 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -335,7 +335,7 @@ .previews-list-item-thumbnail margin: 0 - +margin(2, top) + +margin(2, y) width: var(--preview-thumbnail-max-size) .previews-list-item-thumbnail-img -- 2.30.2 From c533b69e0c3e3dada0cdc12d9cdf9f835bbef8ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 15:32:04 +0200 Subject: [PATCH 29/48] Fix: Fix post web-assets upgrade v2 icon name i-image --- extensions/static/extensions/scripts/manage.js | 2 +- .../templates/extensions/manage/components/add_previews.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/static/extensions/scripts/manage.js b/extensions/static/extensions/scripts/manage.js index a82a77a5..3a50e1fa 100644 --- a/extensions/static/extensions/scripts/manage.js +++ b/extensions/static/extensions/scripts/manage.js @@ -31,7 +31,7 @@ function appendImageUploadForm() {
          - +
          diff --git a/extensions/templates/extensions/manage/components/add_previews.html b/extensions/templates/extensions/manage/components/add_previews.html index c045ffab..bec7c145 100644 --- a/extensions/templates/extensions/manage/components/add_previews.html +++ b/extensions/templates/extensions/manage/components/add_previews.html @@ -11,7 +11,7 @@
          - +
          -- 2.30.2 From b36a6109e01562373275881812380c0c64a8e4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 15:40:54 +0200 Subject: [PATCH 30/48] Chore: Update git submodule web-assets to v2.0.0-alpha.8 --- assets_shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets_shared b/assets_shared index 69ac038a..af61a962 160000 --- a/assets_shared +++ b/assets_shared @@ -1 +1 @@ -Subproject commit 69ac038afd6b9312a9c715b44b7814b0cbdcf572 +Subproject commit af61a962e1a30898279b4efdbb07a2dcb230a257 -- 2.30.2 From 7a06add6f0a8fe71b5e995861f7b7d8490a8af01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 23 Apr 2024 18:57:30 +0200 Subject: [PATCH 31/48] Refactor: Change template and style component card to web-assets base Refactor template card to use web-assets component markup and styles. --- common/static/common/styles/_cards.sass | 15 ++ .../templates/extensions/components/card.html | 135 ++++++++++-------- 2 files changed, 87 insertions(+), 63 deletions(-) diff --git a/common/static/common/styles/_cards.sass b/common/static/common/styles/_cards.sass index 1da1e36d..ab22e3ec 100644 --- a/common/static/common/styles/_cards.sass +++ b/common/static/common/styles/_cards.sass @@ -1,3 +1,18 @@ .card @extend .box +.crads-item-excerpt + line-height: calc(24 / 18) + +.cards-item-extra + text-transform: none + + .cards-item-extra-rating-stars + margin-bottom: .2rem + + .stars + font-size: 1.4rem + +.cards-item-title + +padding(0, y) + diff --git a/extensions/templates/extensions/components/card.html b/extensions/templates/extensions/components/card.html index 0ef059e1..edb1529a 100644 --- a/extensions/templates/extensions/components/card.html +++ b/extensions/templates/extensions/components/card.html @@ -1,68 +1,77 @@ {% load common filters %} {% with latest=extension.latest_version %} - -
          - {% if blur %} -
          - {% endif %} - - -
          -           - -
          -

          - {{ extension.name }} -

          -

          - {{ latest.tagline }} -

          - -
            -
          • - {% if extension.team %} - {% with team=extension.team %} - {{ team.name }} - {% endwith %} - {% elif extension.authors.count %} - {% include "extensions/components/authors.html" %} - {% endif %} -
            • -
          - - - - {% if latest.tags.count %} -
            -
          • - {% include "extensions/components/tags.html" with small=True version=latest %} -
            • -
          + {# TODO: add conditional if is bg blur to web-assets component card #} + {% comment %} +
          + {% if blur %} +
          {% endif %} -
          - {# Author/admin tools can be added here in an extending template #} - {% block admin %}{% endblock admin %} -
          +
          + {% endcomment %} + +
          +
          + +
          + {{ extension.name }} +
          +           +

          + {{ extension.name }} +

          +
          +

          + {{ latest.tagline }} +

          +
          +
          +
            +
          • + {% if extension.team %} + {% with team=extension.team %} + {{ team.name }} + {% endwith %} + {% elif extension.authors.count %} + {% include "extensions/components/authors.html" %} + {% endif %} +
            • +
          + + + + {% if latest.tags.count %} +
            +
          • + {% include "extensions/components/tags.html" with small=True version=latest %} +
            • +
          + {% endif %} +
          +
          + + {# Author/admin tools can be added here in an extending template #} + {% block admin %}{% endblock admin %} +
          {% endwith %} -- 2.30.2 From c0625ce0cfd30295c878ac3a83ea66c0dc5bcba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Thu, 25 Apr 2024 17:07:43 +0200 Subject: [PATCH 32/48] Fix: Fix post web-assets upgrade v2 template list layout --- extensions/templates/extensions/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/templates/extensions/list.html b/extensions/templates/extensions/list.html index dde2e7f5..6cb9a9e9 100644 --- a/extensions/templates/extensions/list.html +++ b/extensions/templates/extensions/list.html @@ -49,7 +49,7 @@
          {% if object_list %} -
          +
          {% for extension in object_list %} {% include "extensions/components/card.html" with show_type=False %} {% endfor %} -- 2.30.2 From f8fe3583973c9ab73752f3387425fc7e803c6232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Thu, 25 Apr 2024 17:09:12 +0200 Subject: [PATCH 33/48] UI: Improve post web-assets v2 upgrade template manage component cards layout and style --- .../templates/extensions/components/card.html | 8 +++---- .../extensions/manage/components/card.html | 23 ++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/extensions/templates/extensions/components/card.html b/extensions/templates/extensions/components/card.html index edb1529a..a480b545 100644 --- a/extensions/templates/extensions/components/card.html +++ b/extensions/templates/extensions/components/card.html @@ -68,10 +68,10 @@
        {% endif %} -
    • -
    - {# Author/admin tools can be added here in an extending template #} - {% block admin %}{% endblock admin %} +
    + {# Author/admin tools can be added here in an extending template #} + {% block admin %}{% endblock admin %} +
    {% endwith %} diff --git a/extensions/templates/extensions/manage/components/card.html b/extensions/templates/extensions/manage/components/card.html index efc45987..73302aee 100644 --- a/extensions/templates/extensions/manage/components/card.html +++ b/extensions/templates/extensions/manage/components/card.html @@ -2,16 +2,17 @@ {% load i18n %} {% block admin %} -
    - - -
    - {% include "common/components/status.html" with object=extension %} -
    +
    +
    {% endblock admin %} -- 2.30.2 From 0eb26e7fa8e4ce8db4e8bbfd919f5c59d030bfbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Thu, 25 Apr 2024 18:06:38 +0200 Subject: [PATCH 34/48] Refactor: Cleanup and remove post web-assets v2 upgrade project styles ext-card Cleanup and remove redundant project-specific styles ext-card after web-assets v2 upgrade. --- common/static/common/styles/_extension.sass | 118 +----------------- .../templates/extensions/components/card.html | 22 ++-- .../extensions/manage/components/card.html | 2 +- 3 files changed, 9 insertions(+), 133 deletions(-) diff --git a/common/static/common/styles/_extension.sass b/common/static/common/styles/_extension.sass index 92243998..2ae65923 100644 --- a/common/static/common/styles/_extension.sass +++ b/common/static/common/styles/_extension.sass @@ -175,105 +175,8 @@ +media-lg --cards-items-per-row: 4 -.ext-card - +box-card - display: flex - flex-direction: column - height: 100% +.cards-item-content overflow: hidden - transition: box-shadow ease-in-out 1s - - &:hover - box-shadow: 1.0rem 1.0rem 2.0rem 0px rgba(0, 0, 0, .04), -1.0rem 0 2.0rem 0px rgba(0, 0, 0, .04) - - &.is-bg-blur - background-color: hsl(213, 10%, 21%) - border: thin solid hsl(213, 10%, 20%) - position: relative - - .ext-card-body - --color-text-secondary: hsla(213, 40%, 90%, .6) - - border-bottom-left-radius: var(--border-radius-lg) - border-bottom-right-radius: var(--border-radius-lg) - +padding(1, top) - mix-blend-mode: screen - position: relative - z-index: 1 - - &:has(.ext-card-admin) - .ext-card-body - border-radius: 0 - - .ext-card-thumbnail-img - -webkit-mask-img: -webkit-gradient(linear, left 60%, left bottom, from(rgba(0,0,0,1)), to(rgba(0,0,0,0))) - - .ext-card-thumbnail:hover - &+.ext-card-body .ext-card-title - color: var(--color-text-primary) - - &.ext-card-row - flex-direction: row - +margin(3, bottom) - - .ext-card-thumbnail - --card-thumbnail-width: 24.0rem - border-top-right-radius: 0 - border-bottom-left-radius: var(--border-radius-lg) - height: 100% - - img - border-top-right-radius: 0 - border-bottom-left-radius: var(--border-radius-lg) - - .ext-blender-version - display: inline-block - -.ext-card-thumbnail-blur - bottom: 0 - filter: blur(5.0rem) - left: 0 - position: absolute - right: 0 - transform: scale(1.25) - top: 0 - z-index: 0 - opacity: .5 - -.ext-card-thumbnail - --card-thumbnail-width: 100% - - align-items: center - border-top-left-radius: var(--border-radius-lg) - border-top-right-radius: var(--border-radius-lg) - display: block - justify-content: center - max-width: var(--card-thumbnail-width) - overflow: hidden - - .ext-card-thumbnail-img - background-position: center - background-size: cover - +make-aspect-ratio('16x9') - transition: transform ease-out var(--transition-speed) - -.ext-card-body - display: flex - flex: 1 - flex-direction: column - justify-content: space-between - +padding(3) - - p - line-height: calc(24 / 18) - -.ext-card-title - font-size: var(--fs-lg) - +margin(3, bottom) - transition: color var(--transition-speed) - - a - text-decoration: none .ext-list-details @extend .list-inline @@ -287,12 +190,6 @@ &+.ext-list-details +margin(2, top) -.ext-card-tags - display: flex - flex-wrap: wrap - gap: var(--spacer-1) - justify-content: flex-start - /* Show only on row list view.*/ .ext-blender-version display: none @@ -300,19 +197,6 @@ .ext-edit-field-row +margin(2, top) -.ext-card-admin - align-items: center - background-color: hsla(213, 80%, 1%, .33) - border-bottom-left-radius: var(--border-radius-lg) - border-bottom-right-radius: var(--border-radius-lg) - border-top: var(--border-width) solid var(--border-color) - display: flex - justify-content: space-between - z-index: 1 - - dd - font-family: var(--font-body) - .previews-upload +box-card +padding(3) diff --git a/extensions/templates/extensions/components/card.html b/extensions/templates/extensions/components/card.html index a480b545..e10e7265 100644 --- a/extensions/templates/extensions/components/card.html +++ b/extensions/templates/extensions/components/card.html @@ -1,15 +1,5 @@ {% load common filters %} {% with latest=extension.latest_version %} - {# TODO: add conditional if is bg blur to web-assets component card #} - {% comment %} -
    - {% if blur %} -
    - {% endif %} - -
    - {% endcomment %} -
    @@ -27,7 +17,7 @@
    {% if latest.tags.count %} -