From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 6 Apr 2020 08:05:01 +0000 (+0200)
Subject: fix #3548 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ac71ce6862e1d5b3877aaa53c020a19ebd87be8c;p=pmi.git

fix #3548 @0.25
---

diff --git a/resources/js/menu.js b/resources/js/menu.js
index 28e6609..3f0291e 100644
--- a/resources/js/menu.js
+++ b/resources/js/menu.js
@@ -8,7 +8,7 @@ document.addEventListener(
     'DOMContentLoaded', () => {
         let nav = document.getElementById("mobile-nav");
         window.mmenu = new MmenuLight(nav, {title: "Menu"});
-        window.menu_breakpoint = 1023; // Note: this should match the menu CSS breakpoint in setup.styl!
+        window.menu_breakpoint = 1479; // Note: this should match the menu CSS breakpoint in setup.styl!
 
         mmenu.enable(`(max-width: ${menu_breakpoint}px)`);
         mmenu.offcanvas();
diff --git a/resources/styles/common/setup.styl b/resources/styles/common/setup.styl
index 0d68001..8e829f4 100644
--- a/resources/styles/common/setup.styl
+++ b/resources/styles/common/setup.styl
@@ -17,7 +17,7 @@ $vertical-gutter   = 5vw
 
 // Breakpoints in Rupture (https://github.com/jescalan/rupture)
 $breakpoint-columns  = 768px // NOTE: this should align with the 'sm' screen value in tailwind.config.js
-$breakpoint-menu     = 1024px // This needs to match the MMenu activation setting in menu.js
+$breakpoint-menu     = 1480px // This needs to match the MMenu activation setting in menu.js
 rupture.scale        = 0 400px   768px   1024px
 rupture.scale-names  = 'small' 'medium' 'large'
 rupture.anti-overlap = -1px // Results in +below(1000px) being max-width: 999px and +above(1000px) being min-width: 1000px
diff --git a/webpack.mix.js b/webpack.mix.js
index e896330..2c0b7a1 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -64,16 +64,16 @@ mix.stylus('resources/styles/app.styl', 'public/css', {
     // }
 });
 
-// mix.stylus('resources/styles/michsci.styl', 'public/css', {
-//         use: [
-//             require('rupture')()
-//         ]
-//     },
-//     [   // postCssPlugins
-//         tailwindcss('tailwind-michsci.config.js'),
-//         require('lost'),
-//     ]
-// );
+mix.stylus('resources/styles/michsci.styl', 'public/css', {
+        use: [
+            require('rupture')()
+        ]
+    },
+    [   // postCssPlugins
+        tailwindcss('tailwind-michsci.config.js'),
+        require('lost'),
+    ]
+);
 
 //=== PurgeCSS to remove unused selectors
 mix.purgeCss({