Bump djhtml from 1.5.2 to 3.0.6 (#10348)

* Bump djhtml from 1.5.2 to 3.0.6 Bumps [djhtml](https://github.com/rtts/djhtml) from 1.5.2 to 3.0.6. - [Release notes](https://github.com/rtts/djhtml/releases) - [Commits](rtts/djhtml@v1.5.2...3.0.6) --- updated-dependencies: - dependency-name: djhtml dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Remove deprecated flag * Lint --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jhonatan Lopes <[email protected]>
MozillaFoundation · Aug 2, 2023 · 682e905 · 682e905
1 parent cc9a49a
commit 682e905
Show file tree

Hide file tree

Showing 53 changed files with 463 additions and 463 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -48,7 +48,7 @@ django==3.2.20
  # django-debug-toolbar
 django-debug-toolbar==4.1.0
  # via -r dev-requirements.in
-djhtml==1.5.2
+djhtml==3.0.6
  # via -r dev-requirements.in
 djlint==1.19.16
  # via -r dev-requirements.in

diff --git a/maintenance/maintenance.html b/maintenance/maintenance.html
@@ -16,7 +16,7 @@
  <!-- Fundraiseup Script -->
  <script>(function(w,d,s,n,a){if(!w[n]){var l='call,catch,on,once,set,then,track'
  .split(','),i,o=function(n){return'function'==typeof n?o.l.push([arguments])&&o
- :function(){return o.l.push([n,arguments])&&o}},t=d.getElementsByTagName(s)[0],
+  :function(){return o.l.push([n,arguments])&&o}},t=d.getElementsByTagName(s)[0],
  j=d.createElement(s);j.async=!0;j.src='https://cdn.fundraiseup.com/widget/'+a;
  t.parentNode.insertBefore(j,t);o.s=Date.now();o.v=4;o.h=w.location.href;o.l=[];
  for(i=0;i<7;i++)o[l[i]]=o(l[i]);w[n]=o}

diff --git a/network-api/networkapi/mozfest/templates/fragments/carousel/carousel_navigation.html b/network-api/networkapi/mozfest/templates/fragments/carousel/carousel_navigation.html
@@ -4,17 +4,17 @@
  <div class="swiper-button-prev">
  <svg class="swiper-button-icon" viewBox="0 0 21 21" fill="none">
  <path d="M20.75 10.5c0-.70761-.5099-1.28125-1.1389-1.28125H1.38889C.759899 9.21875.25 9.79239.25 10.5c0 .7076.509899 1.2812 1.13889 1.2812H19.6111c.629 0 1.1389-.5736 1.1389-1.2812Z"
- fill="currentColor"/>
+  fill="currentColor"/>
  <path d="M10.1664.625269c-.44474-.500359-1.16584-.500359-1.6106 0L.583572 9.59402c-.444763.50038-.444763 1.31158 0 1.81198L8.5558 20.3747c.44476.5004 1.16586.5004 1.6106 0 .4448-.5003.4448-1.3116 0-1.8119L2.99952 10.5l7.16688-8.06277c.4448-.50036.4448-1.3116 0-1.811961Z"
- fill="currentColor"/>
+  fill="currentColor"/>
  </svg>
  </div>
  <div class="swiper-button-next">
  <svg class="swiper-button-icon" viewBox="0 0 21 21" fill="none">
  <path d="M.25 10.5c0-.70761.509898-1.28125 1.13889-1.28125H19.6111c.629 0 1.1389.57364 1.1389 1.28125 0 .7076-.5099 1.2812-1.1389 1.2812H1.38889C.759898 11.7812.25 11.2076.25 10.5Z"
- fill="currentColor"/>
+  fill="currentColor"/>
  <path d="M10.8336.625269c.4447-.500359 1.1658-.500359 1.6106 0l7.9722 8.968751c.4448.50038.4448 1.31158 0 1.81198l-7.9722 8.9687c-.4448.5004-1.1659.5004-1.6106 0-.4448-.5003-.4448-1.3116 0-1.8119L18.0005 10.5l-7.1669-8.06277c-.4448-.50036-.4448-1.3116 0-1.811961Z"
- fill="currentColor"/>
+  fill="currentColor"/>
  </svg>
  </div>
  </div>

diff --git a/network-api/networkapi/mozfest/templates/fragments/carousel_navigation.html b/network-api/networkapi/mozfest/templates/fragments/carousel_navigation.html
@@ -4,21 +4,21 @@ <h2 class="font-weight-bold tw-h3-heading tw-font-semibold tw-mb-8">{{ title }}<
  <div class="swiper-button-prev">
  <svg class="swiper-button-prev__icon" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
  <path fill-rule="evenodd" clip-rule="evenodd"
- d="M20.75 10.5c0-.70761-.5099-1.28125-1.1389-1.28125H1.38889C.759899 9.21875.25 9.79239.25 10.5c0 .7076.509899 1.2812 1.13889 1.2812H19.6111c.629 0 1.1389-.5736 1.1389-1.2812Z"
- fill="currentColor"/>
+  d="M20.75 10.5c0-.70761-.5099-1.28125-1.1389-1.28125H1.38889C.759899 9.21875.25 9.79239.25 10.5c0 .7076.509899 1.2812 1.13889 1.2812H19.6111c.629 0 1.1389-.5736 1.1389-1.2812Z"
+  fill="currentColor"/>
  <path fill-rule="evenodd" clip-rule="evenodd"
- d="M10.1664.625269c-.44474-.500359-1.16584-.500359-1.6106 0L.583572 9.59402c-.444763.50038-.444763 1.31158 0 1.81198L8.5558 20.3747c.44476.5004 1.16586.5004 1.6106 0 .4448-.5003.4448-1.3116 0-1.8119L2.99952 10.5l7.16688-8.06277c.4448-.50036.4448-1.3116 0-1.811961Z"
- fill="currentColor"/>
+  d="M10.1664.625269c-.44474-.500359-1.16584-.500359-1.6106 0L.583572 9.59402c-.444763.50038-.444763 1.31158 0 1.81198L8.5558 20.3747c.44476.5004 1.16586.5004 1.6106 0 .4448-.5003.4448-1.3116 0-1.8119L2.99952 10.5l7.16688-8.06277c.4448-.50036.4448-1.3116 0-1.811961Z"
+  fill="currentColor"/>
  </svg>
  </div>
  <div class="swiper-button-next">
  <svg class="swiper-button-next__icon" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
  <path fill-rule="evenodd" clip-rule="evenodd"
- d="M.25 10.5c0-.70761.509898-1.28125 1.13889-1.28125H19.6111c.629 0 1.1389.57364 1.1389 1.28125 0 .7076-.5099 1.2812-1.1389 1.2812H1.38889C.759898 11.7812.25 11.2076.25 10.5Z"
- fill="currentColor"/>
+  d="M.25 10.5c0-.70761.509898-1.28125 1.13889-1.28125H19.6111c.629 0 1.1389.57364 1.1389 1.28125 0 .7076-.5099 1.2812-1.1389 1.2812H1.38889C.759898 11.7812.25 11.2076.25 10.5Z"
+  fill="currentColor"/>
  <path fill-rule="evenodd" clip-rule="evenodd"
- d="M10.8336.625269c.4447-.500359 1.1658-.500359 1.6106 0l7.9722 8.968751c.4448.50038.4448 1.31158 0 1.81198l-7.9722 8.9687c-.4448.5004-1.1659.5004-1.6106 0-.4448-.5003-.4448-1.3116 0-1.8119L18.0005 10.5l-7.1669-8.06277c-.4448-.50036-.4448-1.3116 0-1.811961Z"
- fill="currentColor"/>
+  d="M10.8336.625269c.4447-.500359 1.1658-.500359 1.6106 0l7.9722 8.968751c.4448.50038.4448 1.31158 0 1.81198l-7.9722 8.9687c-.4448.5004-1.1659.5004-1.6106 0-.4448-.5003-.4448-1.3116 0-1.8119L18.0005 10.5l-7.1669-8.06277c-.4448-.50036-.4448-1.3116 0-1.811961Z"
+  fill="currentColor"/>
  </svg>
  </div>
  </div>

diff --git a/network-api/networkapi/mozfest/templates/fragments/hero/featured_video.html b/network-api/networkapi/mozfest/templates/fragments/hero/featured_video.html
@@ -30,7 +30,7 @@
  <div class="tw-absolute tw-bg-black tw-opacity-25 tw-inset-0 tw-w-full tw-h-full"></div>
  {# Play Icon #}
  <img src="{% static "_images/mozfest/play-circle-grey.svg" %}"
- class="group-hover:tw--translate-y-2 tw-relative tw-z-10 tw-transition tw-w-[75px] tw-h-[75px] medium:tw-w-[108px] medium:tw-h-[108px]" alt=""/>
+  class="group-hover:tw--translate-y-2 tw-relative tw-z-10 tw-transition tw-w-[75px] tw-h-[75px] medium:tw-w-[108px] medium:tw-h-[108px]" alt=""/>
  </span>
  </button>
 

diff --git a/network-api/networkapi/mozfest/templates/fragments/hero/hardcoded_video_hero.html b/network-api/networkapi/mozfest/templates/fragments/hero/hardcoded_video_hero.html
@@ -3,7 +3,7 @@
  <div class="background-wrapper">
  <div class="overlay"></div>
  <video class="banner-video" playsinline muted loop preload
- poster="https://s3.amazonaws.com/mofo-assets/foundation/video/mozfest-banner-video-poster.jpg">
+  poster="https://s3.amazonaws.com/mofo-assets/foundation/video/mozfest-banner-video-poster.jpg">
  <source
  src="https://s3.amazonaws.com/mofo-assets/foundation/video/mozfest-banner-video.mp4"
  type="video/mp4">

diff --git a/network-api/networkapi/mozfest/templates/fragments/session_card.html b/network-api/networkapi/mozfest/templates/fragments/session_card.html
@@ -1,6 +1,6 @@
 {% load static wagtailcore_tags %}
 <a class="tw-block tw-group tw-no-underline tw-p-12 tw-border tw-border-gray-60/20 tw-text-[22px]"
-  href="{{ url }}">
+ href="{{ url }}">
 
  <div class="tw-grid tw-grid-cols-1 medium:tw-grid-cols-5 tw-gap-8">
 
@@ -20,11 +20,11 @@
  <div class="tw-relative w-full medium:w-[250px] tw-h-[140px] tw-overflow-hidden">
  {% if animated_thumbnail %}
  <img class="tw-absolute tw-top-1/2 tw--translate-y-1/2 tw-left-1/2 tw--translate-x-1/2 tw-transform tw-w-12 tw-h-12 tw-z-10 group-hover:tw-opacity-0 tw-transition tw-duration-500 tw-ease-in-out tw-delay-100"
- src="{% static '_images/mozfest/play-triangle.svg' %}" alt="">
+  src="{% static '_images/mozfest/play-triangle.svg' %}" alt="">
  <video class="tw-absolute tw-object-cover tw-left-1/2 tw-top-1/2 tw-h-full tw--translate-y-1/2 tw--translate-x-1/2" src="{{ animated_thumbnail }}" autoplay loop muted width="500" height="200"></video>
  {% endif %}
  <img class="tw-w-full tw-object-cover tw-absolute tw-left-1/2 tw-top-1/2 tw-h-full tw--translate-y-1/2 tw--translate-x-1/2 {% if animated_thumbnail %}group-hover:tw-opacity-0 {% endif %} tw-transition tw-duration-500 tw-ease-in-out tw-delay-100"
- src="{{ image }}" alt="">
+  src="{{ image }}" alt="">
  </div>
  </div>
  </div>

diff --git a/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html b/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html
@@ -13,8 +13,8 @@
  <meta name="gtm-identifier" content="GTM-5TFTDCX">
  <script nonce="{{ request.csp_nonce }}">(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
  new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
- j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
- 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+  'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
  })(window,document,'script','dataLayer','GTM-5TFTDCX');</script>
 {% endblock %}
 

diff --git a/network-api/networkapi/templates/donate/fragments/nav.html b/network-api/networkapi/templates/donate/fragments/nav.html
@@ -9,10 +9,10 @@
  <div class="tw-py-9 small:tw-py-[22px] medium:tw-py-[9px]">
  <div class="tw-flex tw-items-center tw-flex-wrap">
  <a href="{{ menu_root.url }}"
-  class="logo tw-text-hide tw-leading-[0] tw-bg-no-repeat tw-bg-contain
- tw-w-14 tw-h-14 tw-bg-[url('../_images/mozilla-m.svg')]
- small:tw-w-[97px] small:tw-bg-[url('../_images/mozilla-on-black.svg')]
- "
+ class="logo tw-text-hide tw-leading-[0] tw-bg-no-repeat tw-bg-contain
+  tw-w-14 tw-h-14 tw-bg-[url('../_images/mozilla-m.svg')]
+  small:tw-w-[97px] small:tw-bg-[url('../_images/mozilla-on-black.svg')]
+  "
  >
  {{ root_name }}
  </a>

diff --git a/...ork-api/networkapi/templates/fragments/buyersguide/article_listing_what_to_read_next.html b/...ork-api/networkapi/templates/fragments/buyersguide/article_listing_what_to_read_next.html
@@ -4,18 +4,18 @@
 
 <div>
  <div class="
- tw-hidden
- {% if use_wide_above == "medium" %} medium:tw-block {% endif %}
- {% if use_wide_above == "large" %} large:tw-block {% endif %}
- ">
+  tw-hidden
+  {% if use_wide_above == "medium" %} medium:tw-block {% endif %}
+  {% if use_wide_above == "large" %} large:tw-block {% endif %}
+  ">
  {% include "fragments/buyersguide/article_listing_wide.html" with heading=heading articles=articles index_page=index_page columns_above_large=wide_columns_above_large|default:3 %}
  </div>
 
  <div class="
- tw-block
- {% if use_wide_above == "medium" %} medium:tw-hidden {% endif %}
- {% if use_wide_above == "large" %} large:tw-hidden {% endif %}
- ">
+  tw-block
+  {% if use_wide_above == "medium" %} medium:tw-hidden {% endif %}
+  {% if use_wide_above == "large" %} large:tw-hidden {% endif %}
+  ">
  {% include "fragments/buyersguide/article_listing_compact.html" with heading=heading articles=articles index_page=index_page show_images=True %}
  </div>
 </div>
diff --git a/network-api/networkapi/templates/fragments/buyersguide/call_to_action_box.html b/network-api/networkapi/templates/fragments/buyersguide/call_to_action_box.html
@@ -1,25 +1,25 @@
 {% load static wagtailcore_tags wagtailimages_tags %}
 
 <div class="
- tw-w-full
- tw-bg-gradient-to-b tw-from-yellow-10 tw-to-purple-05
- tw-rounded-2xl
- tw-p-12 {% if not large %} medium:tw-p-16 {% else %} medium:tw-p-20 {% endif %}
-">
+  tw-w-full
+  tw-bg-gradient-to-b tw-from-yellow-10 tw-to-purple-05
+  tw-rounded-2xl
+  tw-p-12 {% if not large %} medium:tw-p-16 {% else %} medium:tw-p-20 {% endif %}
+ ">
  {% if icon %}
  {# Use image size twice as large as actual rendering size for better image quality. #}
  {% image icon height-112 as img %}
  <img
  src="{{ img.url }}"
  class="
- tw-mb-8
- {% if not large %}
- tw-max-h-24 medium:tw-max-h-28
- -tw-mt-22 medium:-tw-mt-28 {# Negative margin to pull the icon up to the top and bleed 20px and 24px on medium+ screens. On large variant we don't need that. #}
- {% else %}
- tw-max-h-18 medium:tw-max-h-24
- {% endif %}
- "
+  tw-mb-8
+  {% if not large %}
+  tw-max-h-24 medium:tw-max-h-28
+  -tw-mt-22 medium:-tw-mt-28 {# Negative margin to pull the icon up to the top and bleed 20px and 24px on medium+ screens. On large variant we don't need that. #}
+  {% else %}
+  tw-max-h-18 medium:tw-max-h-24
+  {% endif %}
+  "
  />
  {% endif %}
 

diff --git a/network-api/networkapi/templates/fragments/buyersguide/category_dropdown.html b/network-api/networkapi/templates/fragments/buyersguide/category_dropdown.html
@@ -2,21 +2,21 @@
 
 <button
  class="
- pni-category-dropdown
- tw-hidden
- tw-bg-transparent
- tw-items-center
- tw-relative
- tw-pr-10
- tw-py-4
- tw-mr-auto
- tw-font-sans
- tw-font-bold
- tw-text-sm
- tw-group
- hover:tw-text-black
- tw-text-gray-40
- "
+  pni-category-dropdown
+  tw-hidden
+  tw-bg-transparent
+  tw-items-center
+  tw-relative
+  tw-pr-10
+  tw-py-4
+  tw-mr-auto
+  tw-font-sans
+  tw-font-bold
+  tw-text-sm
+  tw-group
+  hover:tw-text-black
+  tw-text-gray-40
+  "
 >
  <span>{% trans "More Categories" %}</span>
  <svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg" class="tw-ml-4 tw-origin-center tw-stroke-gray-40 group-hover:tw-stroke-black">
@@ -25,21 +25,21 @@
  </svg>
  <ul id="pni-category-dropdown-select" class="tw-hidden tw-list-none tw-absolute tw-right-0 tw-p-0 tw-top-0 tw-z-50 tw-border-gray-20 tw-border tw-pb-4 tw-bg-white">
  <li class="
- tw-bg-white
- tw-w-full
- tw-mr-0
- tw-font-sans
- tw-font-bold
- tw-no-underline
- tw-px-8
- tw-py-4
- tw-mb-0
- tw-text-black
- tw-flex
- tw-items-center
- tw-justify-end
- tw-text-sm
- ">
+  tw-bg-white
+  tw-w-full
+  tw-mr-0
+  tw-font-sans
+  tw-font-bold
+  tw-no-underline
+  tw-px-8
+  tw-py-4
+  tw-mb-0
+  tw-text-black
+  tw-flex
+  tw-items-center
+  tw-justify-end
+  tw-text-sm
+  ">
  <span>{% trans "More Categories" %}</span>
  <svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg" class="tw-ml-4 tw-origin-center tw-stroke-black tw-rotate-180">
  <title>{% trans "Close category drop down" %}</title>

diff --git a/network-api/networkapi/templates/fragments/buyersguide/featured_page.html b/network-api/networkapi/templates/fragments/buyersguide/featured_page.html
@@ -1,15 +1,15 @@
 {% load static wagtailcore_tags wagtailimages_tags i18n %}
 <div data-gtm="featured-pages" class="tw-row">
  <div class="
- tw-px-8
- tw-w-full
- tw-grid
- tw-grid-cols-12
- tw-grid-rows-[(auto,auto,auto)] medium:tw-grid-rows-[(auto,auto)]
+  tw-px-8
+  tw-w-full
+  tw-grid
+  tw-grid-cols-12
+  tw-grid-rows-[(auto,auto,auto)] medium:tw-grid-rows-[(auto,auto)]
  {# Only adding the x gap above medium screens because otherwise the gaps would define a min width for the grid. #}
- medium:tw-gap-x-16
- tw-gap-y-16
- ">
+  medium:tw-gap-x-16
+  tw-gap-y-16
+  ">
 
  {% with search_image=featured_page.search_image %}
  {% image search_image width-650 as img1x %}
@@ -19,10 +19,10 @@
  <a
  href="{{ featured_page_url }}"
  class="
- tw-col-span-full large:tw-col-span-7
- large:tw-row-span-2
- [&_~_a>h2]:hover:tw-underline
- "
+  tw-col-span-full large:tw-col-span-7
+  large:tw-row-span-2
+  [&_~_a>h2]:hover:tw-underline
+  "
  >
  <span class="tw-sr-only">{{ featured_page.title }}</span>
  <img
@@ -36,10 +36,10 @@
  <a
  href="{{ featured_page_url }}"
  class="
- tw-col-span-full medium:tw-col-span-6 large:tw-col-span-5
- tw-no-underline
- tw-group
- "
+  tw-col-span-full medium:tw-col-span-6 large:tw-col-span-5
+  tw-no-underline
+  tw-group
+  "
  >
  <h2 class="tw-h3-heading group-hover:tw-underline">
  {{ featured_page.title }}

diff --git a/network-api/networkapi/templates/fragments/buyersguide/item.html b/network-api/networkapi/templates/fragments/buyersguide/item.html
@@ -2,16 +2,16 @@
 
 <figure
  class="
- product-box
- {% if matched == False %}d-none{% else %}d-flex{% endif %}
- tw-flex-col
- tw-justify-between
- tw-m-0
+  product-box
+  {% if matched == False %}d-none{% else %}d-flex{% endif %}
+  tw-flex-col
+  tw-justify-between
+  tw-m-0
 
- {% if product.draft %}draft-product{% endif %}
- {% if product.adult_content %}adult-content{% endif %}
- {% if product.privacy_ding %}privacy-ding{% endif %}
- "
+  {% if product.draft %}draft-product{% endif %}
+  {% if product.adult_content %}adult-content{% endif %}
+  {% if product.privacy_ding %}privacy-ding{% endif %}
+  "
  data-creepiness="{{ product.creepiness|unlocalize }}"
 >
  <div class="top-left-badge-container">

diff --git a/network-api/networkapi/templates/fragments/buyersguide/pni_category_nav.html b/network-api/networkapi/templates/fragments/buyersguide/pni_category_nav.html
@@ -25,7 +25,7 @@
  src="{% static "_images/buyers-guide/pni-search.svg" %}"
  >
  <input type="text" role="searchbox" id="product-filter-search-input" placeholder="{% trans "Search all products" %}" value=""
- class="tw-bg-blue-05 tw-outline-none tw-py-4 tw-text-base tw-text-blue-60 tw-min-w-0 placeholder:tw-text-blue-60 placeholder:tw-text-[14px] tw-w-full" />
+  class="tw-bg-blue-05 tw-outline-none tw-py-4 tw-text-base tw-text-blue-60 tw-min-w-0 placeholder:tw-text-blue-60 placeholder:tw-text-[14px] tw-w-full" />
  <label for="product-filter-search-input" class="clear-icon">&nbsp;</label>
  </div>
  </div>

diff --git a/network-api/networkapi/templates/fragments/buyersguide/pni_sort_dropdown.html b/network-api/networkapi/templates/fragments/buyersguide/pni_sort_dropdown.html
@@ -2,14 +2,14 @@
 <ul
  id="pni-creepiness"
  class="
- tw-list-none
- tw-relative
- tw-cursor-pointer
- tw-m-0 tw-p-0 medium:tw-ml-4
- tw-flex
- tw-items-center
- tw-min-w-[250px]
- "
+  tw-list-none
+  tw-relative
+  tw-cursor-pointer
+  tw-m-0 tw-p-0 medium:tw-ml-4
+  tw-flex
+  tw-items-center
+  tw-min-w-[250px]
+  "
 >
  <li
  role="button"