From d68f2e5328853c59cbf937773c3e578148f3a076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 12 Mar 2024 10:49:39 +0100 Subject: [PATCH 01/20] 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 2c38af82..6527140b 160000 --- a/assets_shared +++ b/assets_shared @@ -1 +1 @@ -Subproject commit 2c38af8288630d7d30b38440779c7280cf9c8a3b +Subproject commit 6527140bbf1479171256d25d9afcd310ef897f17 -- 2.30.2 From da15686f2c26217b0adadbcbddabc6d371814d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 12 Mar 2024 10:54:32 +0100 Subject: [PATCH 02/20] Chore: Change post web-assets v2 upgrade style studio imports --- common/static/common/styles/studio/studio.sass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/static/common/styles/studio/studio.sass b/common/static/common/styles/studio/studio.sass index 5e8e2984..27bdea59 100644 --- a/common/static/common/styles/studio/studio.sass +++ b/common/static/common/styles/studio/studio.sass @@ -19,9 +19,8 @@ // Vendors @import "../vendor/plyr/plyr"; -// Web Assets dark +// Web Assets @import "../../../../../assets_shared/src/styles/main" -@import "../../../../../assets_shared/src/styles/_variables_dark" // Custom styles @import bootstrap-overrides -- 2.30.2 From 3a68330d32000badb7d5a7c1941d43e2f2c7fa2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 12 Mar 2024 10:55:46 +0100 Subject: [PATCH 03/20] UI: Add post web-assets v2 template base data-theme dark --- common/templates/common/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/templates/common/base.html b/common/templates/common/base.html index 3a70cdfd..a546098f 100644 --- a/common/templates/common/base.html +++ b/common/templates/common/base.html @@ -2,7 +2,7 @@ {% load static %} {% load common_extras %} - + -- 2.30.2 From 0d6375814cce910d599f6a8a8b3dcbca593c9654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 12 Mar 2024 11:03:22 +0100 Subject: [PATCH 04/20] Chore: Run post web-assets v2 upgrade script bash helper --- blog/templates/blog/post_detail.html | 2 +- blog/templates/blog/post_list.html | 2 +- blog/templates/blog/subscribe_jumbotron.html | 2 +- .../templates/characters/character_list.html | 4 +- .../characters/characterversion_detail.html | 4 +- .../characters/components/card_character.html | 10 +- .../components/card_character_showcase.html | 10 +- .../comments/components/comment.html | 2 +- .../common/scripts/vendor/chart.bundle.min.js | 0 .../common/scripts/vendor/highlight.min.js | 1 - .../vendor/instantsearch.production.min.js | 2 +- .../common/scripts/vendor/plyr.polyfilled.js | 10 +- .../styles/studio/_bootstrap-overrides.sass | 14 +-- .../common/styles/studio/_comments.sass | 16 +-- .../static/common/styles/studio/_custom.sass | 48 ++++---- .../common/styles/studio/_dropdown.sass | 4 +- .../static/common/styles/studio/_modal.sass | 2 +- .../common/styles/studio/_navdrawer.sass | 26 ++--- .../common/styles/studio/_utilities.sass | 4 +- .../common/styles/studio/_variables.sass | 32 +++--- .../styles/studio/_web-assets-overrides.sass | 50 ++++----- .../styles/vendor/bootstrap/_accordion.scss | 2 +- .../styles/vendor/bootstrap/_alert.scss | 8 +- .../styles/vendor/bootstrap/_dropdown.scss | 2 +- .../styles/vendor/bootstrap/_pagination.scss | 4 +- .../vendor/bootstrap/_placeholders.scss | 2 +- .../styles/vendor/bootstrap/_popover.scss | 2 +- .../styles/vendor/bootstrap/_reboot.scss | 4 +- .../common/styles/vendor/bootstrap/_root.scss | 8 +- .../styles/vendor/bootstrap/_toasts.scss | 4 +- .../styles/vendor/bootstrap/_utilities.scss | 12 +- .../styles/vendor/bootstrap/_variables.scss | 104 +++++++++--------- .../vendor/bootstrap/forms/_form-check.scss | 20 ++-- .../vendor/bootstrap/forms/_form-control.scss | 4 +- .../vendor/bootstrap/forms/_form-select.scss | 4 +- .../vendor/bootstrap/forms/_input-group.scss | 4 +- .../vendor/bootstrap/forms/_labels.scss | 4 +- .../vendor/bootstrap/mixins/_buttons.scss | 28 ++--- .../vendor/bootstrap/mixins/_reset-text.scss | 2 +- .../common/styles/vendor/plyr/base.scss | 2 +- .../styles/vendor/plyr/components/badges.scss | 2 +- .../vendor/plyr/components/captions.scss | 6 +- .../styles/vendor/plyr/components/menus.scss | 6 +- .../vendor/plyr/components/progress.scss | 2 +- .../styles/vendor/plyr/components/times.scss | 2 +- .../vendor/plyr/components/tooltips.scss | 4 +- .../common/styles/vendor/plyr/lib/mixins.scss | 2 +- .../plyr/plugins/preview-thumbnails.scss | 6 +- .../styles/vendor/plyr/settings/captions.scss | 8 +- .../styles/vendor/plyr/settings/type.scss | 18 +-- .../components/attachments/file_image.html | 6 +- .../common/components/cards/card_blog.html | 12 +- .../components/cards/card_training.html | 12 +- common/templates/common/components/file.html | 8 +- .../common/components/file_carousel.html | 10 +- .../components/file_production_log.html | 16 +-- .../common/components/file_section.html | 10 +- .../templates/common/components/folder.html | 8 +- .../home_headers/film_general_left.html | 4 +- .../common/components/modal_asset.html | 4 +- .../common/components/published_by.html | 6 +- common/templates/common/home.html | 2 +- common/templates/common/welcome.html | 8 +- films/static/films/scripts/film_search.js | 12 +- .../templates/films/components/card_film.html | 10 +- .../films/components/jumbotron_film.html | 2 +- .../components/production_log_entry.html | 4 +- films/templates/films/film_landing_page.html | 76 ++++++------- films/templates/films/films.html | 2 +- playbooks/templates/nginx/errors/5xx.html | 2 +- search/static/search/scripts/search.js | 10 +- search/templates/search/search.html | 2 +- .../templates/checkout/checkout_base.html | 2 +- .../templates/checkout/checkout_done.html | 4 +- .../components/current_plan_variation.html | 2 +- .../subscriptions/components/manage_team.html | 6 +- .../components/plan_selector.html | 2 +- .../emails/paypal_subscription_cancelled.html | 2 +- .../emails/subscription_expired.html | 2 +- .../subscriptions/join/billing_address.html | 2 +- .../templates/subscriptions/manage.html | 16 +-- .../subscriptions/teams_landing.html | 12 +- .../training/scripts/training_search.js | 10 +- training/templates/training/chapter.html | 2 +- .../training/components/card_training.html | 12 +- .../components/card_training_section.html | 10 +- .../training/components/jumbotron.html | 2 +- .../training/home_authenticated.html | 4 +- .../training/home_not_authenticated.html | 4 +- training/templates/training/section.html | 2 +- .../users/settings/production_credits.html | 10 +- users/templates/users/settings/tabs.html | 2 +- 92 files changed, 427 insertions(+), 428 deletions(-) mode change 100755 => 100644 common/static/common/scripts/vendor/chart.bundle.min.js diff --git a/blog/templates/blog/post_detail.html b/blog/templates/blog/post_detail.html index 8e6401b8..88c6f7b9 100644 --- a/blog/templates/blog/post_detail.html +++ b/blog/templates/blog/post_detail.html @@ -19,7 +19,7 @@ {% block content %} {% if post.header %}
-
+
diff --git a/blog/templates/blog/post_list.html b/blog/templates/blog/post_list.html index c4109a2d..c3707ff2 100644 --- a/blog/templates/blog/post_list.html +++ b/blog/templates/blog/post_list.html @@ -19,7 +19,7 @@ {% include "common/components/navigation/pagination.html" %} -
+
{% for post in posts %} {% if post.is_published or user.is_superuser or user.is_staff %} {% include 'common/components/cards/card_blog.html' %} diff --git a/blog/templates/blog/subscribe_jumbotron.html b/blog/templates/blog/subscribe_jumbotron.html index 17e8e596..7e986008 100644 --- a/blog/templates/blog/subscribe_jumbotron.html +++ b/blog/templates/blog/subscribe_jumbotron.html @@ -18,7 +18,7 @@
-
+
diff --git a/characters/templates/characters/character_list.html b/characters/templates/characters/character_list.html index 2723eb4b..473c0b27 100644 --- a/characters/templates/characters/character_list.html +++ b/characters/templates/characters/character_list.html @@ -22,7 +22,7 @@ -
+
@@ -33,7 +33,7 @@
-
+
{% for character in characters %} {% if character.is_published or user.is_superuser or user.is_staff %} {% include "characters/components/card_character.html" %} diff --git a/characters/templates/characters/characterversion_detail.html b/characters/templates/characters/characterversion_detail.html index 8ef09867..7e289376 100644 --- a/characters/templates/characters/characterversion_detail.html +++ b/characters/templates/characters/characterversion_detail.html @@ -76,7 +76,7 @@
{% include 'common/components/cards/card_profile.html' with user=character_version.static_asset.user title="Publisher" %}
-
+
{% if character_version.is_free %} {% include "common/components/cards/pill.html" with label='Free' %} {% endif %} @@ -103,7 +103,7 @@
{% with_shortcodes character_version.description|markdown_unsafe %}
{% if character.showcases.count %}

Showcases

-
+
{% for showcase in character.showcases.all %} {% include "characters/components/card_character_showcase.html" %} {% endfor %} diff --git a/characters/templates/characters/components/card_character.html b/characters/templates/characters/components/card_character.html index 89ed91a8..eea24d86 100644 --- a/characters/templates/characters/components/card_character.html +++ b/characters/templates/characters/components/card_character.html @@ -1,22 +1,22 @@ {% load common_extras %} {% with character_version=character.latest_version %} {% with character_version.get_absolute_url as detail_url %} -
- +
+ {% if character_version.static_asset.thumbnail %} -
+
{% block image %} {{ character.name }} {% endblock image %}
{% endif %} -

+

{% if character.is_new and character.is_published %}
New
{% endif %} {{ character.name }}

-
+