From 432b499e0b69e8dd494101b59d03800397049db1 Mon Sep 17 00:00:00 2001 From: Mavis Ou Date: Wed, 1 May 2024 11:59:52 -0700 Subject: [PATCH] revert changes for desktop --- .../templates/fragments/blocks/nav/dropdown.html | 2 +- source/js/components/nav/desktop-dropdown.js | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html b/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html index 9f1dd95c18f..b15587b54cf 100644 --- a/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html +++ b/network-api/networkapi/templates/fragments/blocks/nav/dropdown.html @@ -3,7 +3,7 @@ {% fragment as content_base_styles %}tw-py-0 tw-px-0 tw-gap-8 tw-overflow-y-auto tw-transition-all tw-duration-500{% endfragment %} {% fragment as dropdown_selector_base %}tw-flex tw-flex-row tw-items-center tw-justify-between tw-w-full tw-py-12 tw-px-8 tw-gap-4{% endfragment %} -{% fragment as content_desktop %}large:tw-max-w-[1250px] xlarge:tw-max-w-[1350px] 2xl:tw-max-w-[1600px] large:tw-w-full large:tw-px-24 large:tw-grid large:tw-duration-100 large:tw-invisible large:tw-opacity-0{% endfragment %} +{% fragment as content_desktop %}large:tw-max-w-[1250px] xlarge:tw-max-w-[1350px] 2xl:tw-max-w-[1600px] large:tw-w-full large:tw-px-24 large:tw-hidden{% endfragment %} {% fragment as content_desktop_border %}large:tw-border large:tw-border-gray-20{% endfragment %} {% comment %} 40 (5rem) is the height of the navbar {% endcomment %} {% fragment as content_desktop_positioning %}large:tw-fixed large:tw-top-40 large:tw-left-0 large:tw-right-0 large:tw-mx-auto{% endfragment %} diff --git a/source/js/components/nav/desktop-dropdown.js b/source/js/components/nav/desktop-dropdown.js index a9bfb8f7833..270d1ddf3b5 100644 --- a/source/js/components/nav/desktop-dropdown.js +++ b/source/js/components/nav/desktop-dropdown.js @@ -63,9 +63,8 @@ class NavDesktopDropdown extends Accordion { this.titleText.classList.add("large:tw-border-black"); this.titleText.classList.remove("large:tw-border-transparent"); this.accordion.setAttribute("aria-selected", "true"); - this.content.classList.remove("large:tw-opacity-0", "large:tw-invisible"); - this.content.classList.add("large:tw-opacity-100", "large:tw-visible"); - + this.content.classList.add("large:tw-grid"); + this.content.classList.remove("large:tw-hidden"); if (this.isDropdownWayfindingActive === "true") { this.handleWayfindingOpenStyles(); } @@ -94,8 +93,8 @@ class NavDesktopDropdown extends Accordion { this.titleText.classList.remove("large:tw-border-black"); this.titleText.classList.add("large:tw-border-transparent"); this.accordion.setAttribute("aria-selected", "false"); - this.content.classList.remove("large:tw-opacity-100", "large:tw-visible"); - this.content.classList.add("large:tw-opacity-0", "large:tw-invisible"); + this.content.classList.remove("large:tw-grid"); + this.content.classList.add("large:tw-hidden"); if (this.isDropdownWayfindingActive === "true") { this.handleWayfindingClosedStyles(); }