Merge branch 'main' into feature/#469-heading-anchors

# Conflicts:
#	public/dist/assets/js/main.min.js

Author: jean-gui

assets-src/js/main/account-menu.js

@@ -3,6 +3,7 @@ import {translate} from "./translations";
 let accountMenu = function () {
 
 	let userInfo = null;
+	let maxWidth = 1120;
 
 	const buildAccountMenu = function(userInfo) {
 		if (userInfo == null || userInfo.length < 1) {
@@ -54,7 +55,8 @@ let accountMenu = function () {
 		toggleButton.innerHTML = '<span class="sr-only">' + translate.translate('my-account', languageCode) + ' <span class="visuallyhidden">(' + translate.translate( 'logged-in' , languageCode) + ')</span></span><div class="avatar avatar--small icon"><img alt="" src="' + userInfo.avatar.thumbnail + '"/></div>';
 
 		// Media query event handler
-		let mq = window.matchMedia('(min-width: 71.25em)');
+		let mqValue = maxWidth / 16;
+		let mq = window.matchMedia('(min-width: ' + mqValue + 'em)');
 		mq.addListener(insertAccountBtn);
 		insertAccountBtn(mq);
 

public/dist/assets/js/main.js

@@ -230,6 +230,7 @@ __webpack_require__.r(__webpack_exports__);
 
 let accountMenu = function () {
   let userInfo = null;
+  let maxWidth = 1120;
   const buildAccountMenu = function (userInfo) {
     if (userInfo == null || userInfo.length < 1) {
       return;
@@ -274,7 +275,8 @@ let accountMenu = function () {
     toggleButton.innerHTML = '<span class="sr-only">' + _translations__WEBPACK_IMPORTED_MODULE_0__.translate.translate('my-account', languageCode) + ' <span class="visuallyhidden">(' + _translations__WEBPACK_IMPORTED_MODULE_0__.translate.translate('logged-in', languageCode) + ')</span></span><div class="avatar avatar--small icon"><img alt="" src="' + userInfo.avatar.thumbnail + '"/></div>';
 
     // Media query event handler
-    let mq = window.matchMedia('(min-width: 71.25em)');
+    let mqValue = maxWidth / 16;
+    let mq = window.matchMedia('(min-width: ' + mqValue + 'em)');
     mq.addListener(insertAccountBtn);
     insertAccountBtn(mq);
     function insertAccountBtn(mq) {

templates/components/listings/blog/filters.html.twig

@@ -22,11 +22,6 @@
                 <button type="button" class="button button--ghost with-icon with-icon--after"
                         style="display:none;" data-toggle="true">
                     {{ 'listing.blog.filters.categories'|trans({}, 'w3c_website_templates_bundle') }}
-                    <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon"
-                         focusable="false" aria-hidden="true" width="1em" height="1em">
-                        <path class="angle-down" d="M143 352.3L7 216.3c-9.4-9.4-9.4-24.6 0-33.9l22.6-22.6c9.4-9.4 24.6-9.4 33.9 0l96.4 96.4 96.4-96.4c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9l-136 136c-9.2 9.4-24.4 9.4-33.8 0z"/>
-                        <path class="angle-up" d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"/>
-                    </svg>
                 </button>
                 <nav id="category-nav" aria-label="{{ 'listing.blog.filters.categories_label'|trans({}, 'w3c_website_templates_bundle') }}">
                     <ul class="clean-list" role="list">
@@ -47,11 +42,6 @@
                 <button type="button" class="button button--ghost with-icon with-icon--after"
                         style="display:none;" data-toggle="true">
                     {{ 'listing.blog.filters.archives'|trans({}, 'w3c_website_templates_bundle') }}
-                    <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon"
-                         focusable="false" aria-hidden="true" width="1em" height="1em">
-                        <path class="angle-down" d="M143 352.3L7 216.3c-9.4-9.4-9.4-24.6 0-33.9l22.6-22.6c9.4-9.4 24.6-9.4 33.9 0l96.4 96.4 96.4-96.4c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9l-136 136c-9.2 9.4-24.4 9.4-33.8 0z"/>
-                        <path class="angle-up" d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"/>
-                    </svg>
                 </button>
                 <nav id="archive-nav" aria-label="{{ 'listing.blog.filters.archives_label'|trans({}, 'w3c_website_templates_bundle') }}">
                     <ul class="clean-list" role="list">

templates/components/listings/news/filters.html.twig

@@ -22,11 +22,6 @@
                 <button type="button" class="button button--ghost with-icon with-icon--after"
                         style="display:none;" data-toggle="true">
                     {{ 'listing.news.filters.archives'|trans({}, 'w3c_website_templates_bundle') }}
-                    <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon"
-                         focusable="false" aria-hidden="true" width="1em" height="1em">
-                        <path class="angle-down" d="M143 352.3L7 216.3c-9.4-9.4-9.4-24.6 0-33.9l22.6-22.6c9.4-9.4 24.6-9.4 33.9 0l96.4 96.4 96.4-96.4c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9l-136 136c-9.2 9.4-24.4 9.4-33.8 0z"/>
-                        <path class="angle-up" d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"/>
-                    </svg>
                 </button>
                 <nav id="archive-nav" aria-label="{{ 'listing.news.filters.archives_label'|trans({}, 'w3c_website_templates_bundle') }}">
                     <ul class="clean-list" role="list">

templates/components/listings/newsletters/filters.html.twig

@@ -6,11 +6,6 @@
                 <button type="button" class="button button--ghost with-icon with-icon--after"
                         style="display:none;" data-toggle="true">
                     {{ 'listing.newsletters.filters.archives'|trans({}, 'w3c_website_templates_bundle') }}
-                    <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon"
-                         focusable="false" aria-hidden="true" width="1em" height="1em">
-                        <path class="angle-down" d="M143 352.3L7 216.3c-9.4-9.4-9.4-24.6 0-33.9l22.6-22.6c9.4-9.4 24.6-9.4 33.9 0l96.4 96.4 96.4-96.4c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9l-136 136c-9.2 9.4-24.4 9.4-33.8 0z"/>
-                        <path class="angle-up" d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"/>
-                    </svg>
                 </button>
                 <nav id="archive-nav" aria-label="{{ 'listing.newsletters.filters.archives_label'|trans({}, 'w3c_website_templates_bundle') }}">
                     <ul class="clean-list" role="list">

templates/components/listings/press-releases/filters.html.twig

@@ -6,11 +6,6 @@
                 <button type="button" class="button button--ghost with-icon with-icon--after"
                         style="display:none;" data-toggle="true">
                     {{ 'listing.press_releases.filters.archives'|trans({}, 'w3c_website_templates_bundle') }}
-                    <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon"
-                         focusable="false" aria-hidden="true" width="1em" height="1em">
-                        <path class="angle-down" d="M143 352.3L7 216.3c-9.4-9.4-9.4-24.6 0-33.9l22.6-22.6c9.4-9.4 24.6-9.4 33.9 0l96.4 96.4 96.4-96.4c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9l-136 136c-9.2 9.4-24.4 9.4-33.8 0z"/>
-                        <path class="angle-up" d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"/>
-                    </svg>
                 </button>
                 <nav id="archive-nav" aria-label="{{ 'listing.press_releases.filters.archives_label'|trans({}, 'w3c_website_templates_bundle') }}">
                     <ul class="clean-list" role="list">