Merge branch 'release/5.0.0-beta.3' into v5

nystudio107 · Feb 9, 2024 · c58a11e · c58a11e
2 parents 870b1d3 + 16b0042
commit c58a11e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Webperf Changelog
 
+## 5.0.0-beta.3 - 2024.02.09
+### Fixed
+* Fixed an issue with the Sites menu styling
+
 ## 5.0.0-beta.2 - 2024.02.09
 ### Fixed
 * Added  the unused `static` to the Tailwind CSS `blocklist` to avoid a name collision with a Craft CSS class ([#1412](https://github.com/nystudio107/craft-seomatic/issues/1412))

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-webperf",
   "description": "Webperf helps you build & maintain high quality websites through Real User Measurement of your website's performance",
   "type": "craft-plugin",
-  "version": "5.0.0-beta.2",
+  "version": "5.0.0-beta.3",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/templates/_includes/sites-menu.twig b/src/templates/_includes/sites-menu.twig
@@ -4,17 +4,20 @@
 {% set params = params ?? [] %}
 
 {% if showSites %}
-    <div id="sites-btn" class="btn menubtn" data-icon="world">{{ sitesMenuLabel }}</div>
-    <div class="menu">
+    <a id="sites-btn" class="crumb-link" data-icon="world"> {{ sitesMenuLabel }} </a>
+    <button type="button" class="btn menubtn" aria-label="Select site" aria-controls="language-menu"
+            data-disclosure-trigger="" aria-expanded="false"></button>
+
+    <div id="language-menu" class="padded menu">
         <ul class="padded">
             <li>
                 {% if currentSiteId == 0 %}
-                    <a class="sel">
+                    <a class="menu-item sel">
                         <div class="status enabled"></div>{{ "All Sites"|t('webperf') }}
                     </a>
                 {% else %}
                     {% set url = url(baseUrl, params) %}
-                    <a href="{{ url }}">
+                    <a href="{{ url }}" class="menu-item">
                         <div class="status enabled"></div>{{ "All Sites"|t('site') }}
                     </a>
                 {% endif %}
@@ -31,12 +34,12 @@
                         {% set status = siteId in enabledSiteIds ? 'enabled' : 'disabled' %}
                         <li>
                             {% if siteId == currentSiteId %}
-                                <a class="sel">
+                                <a class="menu-item sel">
                                     <div class="status {{ status }}"></div>{{ site.name|t('site') }}
                                 </a>
                             {% else %}
                                 {% set url = url(baseUrl~site.handle, params) %}
-                                <a href="{{ url }}">
+                                <a href="{{ url }}" class="menu-item">
                                     <div class="status {{ status }}"></div>{{ site.name|t('site') }}
                                 </a>
                             {% endif %}