Merge branch 'hotfix/0.22.5'

Author: marceloglacial

app/config/sculpin_site.yml

@@ -1,7 +1,7 @@
 # Site wide global vars - eg. {{ site.title }} can be used in templates
 title: RDS Local
 subtitle: RDS
-version: 0.22.1
+version: 0.22.5
 cssSize: 45KB
 cssG: 10KB
 jsSize: 10KB

dist/0.22.5/core.css

@@ -2,17 +2,28 @@
 
 All notable changes to the project will be documented here, in this file
 
-## [v0.22.1](https://github.com/ravendesignsystem/rds/releases/tag/0.21.2 2021-08-25
+## [v0.22.5](https://github.com/ravendesignsystem/rds/releases/tag/0.22.5 2022-01-31
+
+- **Fixed:**  Fixed Masthead disappearing on desktop
+
+
+## [v0.22.1](https://github.com/ravendesignsystem/rds/releases/tag/0.22.1 2021-08-25
 
 - **Fixed:**  fixed navbar issue
-## [v0.22.0](https://github.com/ravendesignsystem/rds/releases/tag/0.21.2 2021-03-04
+
+
+## [v0.22.0](https://github.com/ravendesignsystem/rds/releases/tag/0.22.0 2021-03-04
 
 - **Fixed:**  fixed bug in twig template causing local compilation errors
 - **Fixed:**  fixed FileManagerPlugin syntax in Webpack config to align with updates
 - **Added:**  update logos to new brand!
+
+
 ## [v0.21.2](https://github.com/ravendesignsystem/rds/releases/tag/0.21.2 2021-03-04
 
 - **Fixed:**  fix masthead for mobile
+
+
 ## [v0.21.1](https://github.com/ravendesignsystem/rds/releases/tag/0.21.1 2020-10-21
 
 Small changes for testing.

dist/0.22.5/core.css.gz

@@ -19,6 +19,7 @@ body {
 .b-masthead nav {
 	width: 100%;
 	margin-right: 50px;
+	overflow-x: scroll;
 }
 
 //
@@ -234,3 +235,9 @@ body {
 		// }
 	}
 }
+
+.masthead__actions.nav__menu--vert {
+	position: absolute;
+	right: 0;
+	background-color: white;
+}

dist/0.22.5/core.js

@@ -1,9 +1,9 @@
-import dialogPolyfill from 'dialog-polyfill';
+// import dialogPolyfill from 'dialog-polyfill';
 
 // TODO revert this back when done fixing errors
 import { closeMenuState } from '../../_components/navmenu/navmenu';
 
-let scrollPosition;
+// let scrollPosition;
 let lastScrollTop = 0;
 let st;
 const body = document.querySelector('body');
@@ -58,21 +58,22 @@ const detectOverflowOnMasthead = () => {
  *  @desc adds class to display red banner error stating the menu is too wide
  */
 
-const navContainer = document.querySelector('.b-masthead nav');
-const navMenu = document.querySelector('.nav__menu--top');
-const initialNavMenuWidth = navMenu && navMenu.offsetWidth + 50;
+// const navContainer = document.querySelector('.b-masthead nav');
+// const navMenu = document.querySelector('.nav__menu--top');
+// const initialNavMenuWidth = navMenu && navMenu.offsetWidth + 50;
 
 const toggleMobileMenu = () => {
 	if (!mastheadNav) return;
 
 	const mastheadClassList = mastheadNavIcon.parentNode.classList;
-	const navContainerWidth = mastheadClassList.contains('u-hide-l')
-		? navContainer.offsetWidth
-		: navContainer.offsetWidth + 52;
+	// const navContainerWidth = mastheadClassList.contains('u-hide-l')
+	// 	? navContainer.offsetWidth
+	// 	: navContainer.offsetWidth + 52;
 
 	// capture div width and compare against window width
 	// TODO: aria expanded stays at true when nav comes back into view, this causes the grey bg on buttons with submenus
-	if (initialNavMenuWidth >= navContainerWidth || window.innerWidth <= 760) {
+	// if (initialNavMenuWidth >= navContainerWidth || window.innerWidth <= 760) {
+	if (window.innerWidth <= 760) {
 		// Moves nav to mobile dialogue in footer
 		modalMenu.appendChild(mastheadNav);
 
@@ -244,15 +245,15 @@ const handleResize = () => {
  *  @desc init function for the masthead functionality
  */
 const handleLoading = () => {
-	window.addEventListener(
-		'load',
-		() => {
-			toggleMobileMenu();
-			toggleAppendMenu();
-			closeMenuState();
-		},
-		false
-	);
+	// window.addEventListener(
+	// 	'load',
+	// 	() => {
+	toggleMobileMenu();
+	toggleAppendMenu();
+	closeMenuState();
+	// 	},
+	// 	false
+	// );
 };
 
 const handleClick = () => {
@@ -306,9 +307,9 @@ const handleKeyPress = () => {
  */
 const Masthead = () => {
 	if (!masthead) return;
+	handleLoading();
 	handleScroll();
 	handleResize();
-	handleLoading();
 	handleClick();
 	handleKeyPress();
 };

dist/0.22.5/core.js.gz

@@ -16,7 +16,7 @@
 
 // 0. RDS version
 // --------------
-$version: '0.22.1';
+$version: '0.22.5';
 
 // 1. Media query breakpoints
 // --------------------------

dist/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
 	"name": "@carleton/rds",
-	"version": "0.22.1",
+	"version": "0.22.5",
 	"description": "RDS, Carleton University’s design system, is a living digital organism uniting campus wide teams around a common visual language.",
 	"main": "core/js/core",
 	"scripts": {