SOEOPSFY24-157, 156, 149: style fixes for news subnav

SU-SOE · Aug 20, 2024 · 320eacc · 320eacc
1 parent 78bba6b
commit 320eacc
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 10 deletions.
diff --git a/...ring_profile_helper/modules/engineering_magazine/dist/css/engineering_magazine.styles.css b/...ring_profile_helper/modules/engineering_magazine/dist/css/engineering_magazine.styles.css
diff --git a/...eering_profile_helper/modules/engineering_magazine/dist/js/engineering_magazine.script.js b/...eering_profile_helper/modules/engineering_magazine/dist/js/engineering_magazine.script.js
@@ -11,12 +11,10 @@ var __webpack_exports__ = {};
           toggleButton.attr('aria-expanded', 'true');
           toggleButton.removeClass('soe-magazine__navigation-rotate-down');
           toggleButton.addClass('soe-magazine__navigation-rotate-up');
-          topicsItem.addClass('active');
         } else {
           toggleButton.attr('aria-expanded', 'false');
           toggleButton.removeClass('soe-magazine__navigation-rotate-up');
           toggleButton.addClass('soe-magazine__navigation-rotate-down');
-          topicsItem.removeClass('active');
         }
       });
       var mobileToggle = $('#mobile-magazine-landing-nav__toggle');
@@ -55,14 +53,32 @@ var __webpack_exports__ = {};
           $('a.su-multi-menu__link[href="/news"]').closest('li').addClass('su-multi-menu__item--active-trail');
         }
       }
+      function fixNewsSubnavActivePath() {
+        var path = window.location.pathname;
+        var windowWidth = $(window).width();
+        if (windowWidth >= 768) {
+          if (path.indexOf('/future-everything-podcast') !== -1) {
+            $('.foe_item').addClass('active');
+          } else {
+            $('.foe_item').removeClass('active');
+          }
+          if (path.indexOf('/news/topic/') !== -1) {
+            $('.topics_item').addClass('active');
+          } else {
+            $('.topics_item').removeClass('active');
+          }
+        }
+      }
 
       // Run on document ready
       reorderElements();
       fixNewsActivePath();
+      fixNewsSubnavActivePath();
 
       // Run on window resize
       $(window).resize(function () {
         reorderElements();
+        fixNewsSubnavActivePath();
       });
     }
   };

diff --git a/...les/engineering_profile_helper/modules/engineering_magazine/lib/js/magazine_navigation.js b/...les/engineering_profile_helper/modules/engineering_magazine/lib/js/magazine_navigation.js
@@ -11,12 +11,10 @@
                     toggleButton.attr('aria-expanded', 'true');
                     toggleButton.removeClass('soe-magazine__navigation-rotate-down');
                     toggleButton.addClass('soe-magazine__navigation-rotate-up');
-                    topicsItem.addClass('active');
                 } else {
                     toggleButton.attr('aria-expanded', 'false');
                     toggleButton.removeClass('soe-magazine__navigation-rotate-up');
                     toggleButton.addClass('soe-magazine__navigation-rotate-down');
-                    topicsItem.removeClass('active');
                 }
             });
 
@@ -60,13 +58,32 @@
               }
             }
 
+            function fixNewsSubnavActivePath() {
+              let path = window.location.pathname;
+              var windowWidth = $(window).width();
+              if (windowWidth >= 768) {
+                if (path.indexOf('/future-everything-podcast') !== -1) {
+                  $('.foe_item').addClass('active');
+                } else {
+                  $('.foe_item').removeClass('active');
+                }
+                if (path.indexOf('/news/topic/') !== -1) {
+                  $('.topics_item').addClass('active');
+                } else {
+                  $('.topics_item').removeClass('active');
+                }
+              }
+            }
+
             // Run on document ready
             reorderElements();
             fixNewsActivePath();
+            fixNewsSubnavActivePath();
 
             // Run on window resize
             $(window).resize(function() {
               reorderElements();
+              fixNewsSubnavActivePath();
             });
 
 

diff --git a/...es/engineering_magazine/lib/scss/components/magazine_navigation/_magazine-navigation.scss b/...es/engineering_magazine/lib/scss/components/magazine_navigation/_magazine-navigation.scss
@@ -2,7 +2,8 @@
   display: none;
 }
 
-.page-news {
+.page-news,
+.section-news {
   .section-bgcolor--title {
     background: none;
     color: $su-color-black;
@@ -28,8 +29,8 @@
     width: 100%;
     border-top: 1px solid black;
     border-bottom: 1px solid black;
-    padding-top: 1em;
-    padding-bottom: 1em;
+    //padding-top: 1em;
+    //padding-bottom: 1em;
 
     @include grid-media-max("sm") {
       width: 90%;
@@ -163,7 +164,9 @@
       font-size: 1.1em;
       font-weight: $su-font-semi-bold;
       color: $soe-magazine-nav-item-color;
-      //margin-right: 1em;
+      padding-top: 15px;
+      padding-bottom: 15px;
+      border-bottom: 2px solid transparent;
 
       a {
         &:hover,
@@ -173,6 +176,12 @@
         }
       }
 
+      &:hover,
+      &:active,
+      &:focus {
+        border-bottom: 2px solid $su-color-black;
+      }
+
       @include grid-media-max("sm") {
         text-align: left;
         padding: 0.5em;
@@ -183,6 +192,11 @@
       }
     }
 
+    .news-navigation-nav__item.active {
+      height: 100%;
+      border-bottom: 2px solid $su-color-black;
+    }
+
     .topics-panel__header {
       @include grid-media-max("sm") {
         display: none;

diff --git a/tests/codeception/acceptance/Content/BasicPageCest.php b/tests/codeception/acceptance/Content/BasicPageCest.php
@@ -93,7 +93,7 @@ public function testDeletedMenuItems(AcceptanceTester $I) {
     $I->amOnPage($node->toUrl('delete-form')->toString());
     $I->click('Delete');
     $I->runDrush('cr');
-    $I->wait(5);
+    sleep(5);
     $I->amOnPage('/');
     $I->cantSeeLink($node_title);
   }