wip #3321 @0.25

diff --git a/resources/styles/michsci.styl b/resources/styles/michsci.styl
new file mode 100644 (file)
index 0000000..e6e24f2
--- /dev/null
+++ b/resources/styles/michsci.styl
@@ -0,0 +1,3 @@
+body {
+  background-color: #ff0000 !important;
+}

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 57992a761b3978d23bb44a3ba131d7ae9693668a..9e6508bcd6df80fd58e47f0e100154632879a563 100644 (file)
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -1,21 +1,22 @@
 @prepend('stylesheets')
-    <link href="{{ mix('css/app.css') }}" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Barlow:400,500,600|Muli:400,700&display=swap" rel="stylesheet">
+<link href="{{ mix('css/app.css') }}" rel="stylesheet">
+@if($variant==='MICHSCI')
+<link href="{{ mix('css/michsci.css') }}" rel="stylesheet">
+@endif
+<link href="https://fonts.googleapis.com/css?family=Barlow:400,500,600|Muli:400,700&display=swap" rel="stylesheet">
 @endprepend
 
 @prepend('scripts')
-
-    {{-- Automatic polyfills --}}
-    <script crossorigin="anonymous" src="https://polyfill.io/v3/polyfill.min.js?flags=gated&features=String.prototype.normalize%2Ces6"></script>
-
+{{-- Automatic polyfills --}}
+<script crossorigin="anonymous" src="https://polyfill.io/v3/polyfill.min.js?flags=gated&features=String.prototype.normalize%2Ces6"></script>
     {{-- MMenu polyfills --}}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/dom4/2.0.0/dom4.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/dom4/2.0.0/dom4.js"></script>
 
-    <script src="{{ mix('/js/app.js') }}"></script>
-    <script src="{{ mix('/js/vendor.js') }}"></script>
+<script src="{{ mix('/js/app.js') }}"></script>
+<script src="{{ mix('/js/vendor.js') }}"></script>
 
     {{-- Modernizr is built differently so can't use mix helper here. Todo: find a better way --}}
-    <script src="/js/modernizr.js"></script>
+<script src="/js/modernizr.js"></script>
 @endprepend
 
 @include('cubist::head.htmldeclaration')

diff --git a/webpack.mix.js b/webpack.mix.js
index 3212a9d7bf4a0ca5141972de67d3c3bd0870ee00..da8f78836292e17f36417dcf4fbb6c534ba40d73 100644 (file)
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -31,7 +31,7 @@ mix.js('resources/js/app.js', 'public/js')
     .js('resources/js/vendor/**/**/app.js', 'public/js/vendor.js')
     .js('resources/js/carrousel.js', 'public/js')
     .js('resources/js/logowall.js', 'public/js')
-    .js('resources/js/product-details.js','public/js')
+    .js('resources/js/product-details.js', 'public/js')
     .js('resources/js/mailform.js', 'public/js');
 
 // mix.polyfill({
@@ -42,10 +42,26 @@ mix.js('resources/js/app.js', 'public/js')
 
 //=== Stylus / PostCSS
 mix.stylus('resources/styles/app.styl', 'public/css', {
-        use: [
-            require('rupture')()
-        ]
-    }).options({
+    use: [
+        require('rupture')()
+    ]
+}).options({
+    postCss: [
+        tailwindcss('tailwind.config.js'),
+        require('lost'),
+    ],
+    // autoprefixer: {
+    //   options: {
+    //     grid: true, // Enable CSS grid prefixes for IE
+    //   }
+    // }
+});
+
+mix.stylus('resources/styles/michsci.styl', 'public/css', {
+    use: [
+        require('rupture')()
+    ]
+}).options({
     postCss: [
         tailwindcss('tailwind.config.js'),
         require('lost'),
@@ -59,13 +75,13 @@ mix.stylus('resources/styles/app.styl', 'public/css', {
 
 //=== PurgeCSS to remove unused selectors
 mix.purgeCss({
-        globs: [
-            path.join(__dirname, 'vendor/cubist/**/*.php'), // Some classes (eg. nav) might be present only here
-        ],
-        // Don't purge the grid-* custom classes since they can be used dynamically
-        // Also protect dynamic page template and MMenu classes
-        whitelistPatterns: [/template-.*/, /mm.*/, /grid-.*/, /no-cssgrid/],
-    });
+    globs: [
+        path.join(__dirname, 'vendor/cubist/**/*.php'), // Some classes (eg. nav) might be present only here
+    ],
+    // Don't purge the grid-* custom classes since they can be used dynamically
+    // Also protect dynamic page template and MMenu classes
+    whitelistPatterns: [/template-.*/, /mm.*/, /grid-.*/, /no-cssgrid/],
+});
 
 
 //=== Production build