From 6e3179db960fb7a943897a2ad5f967c383b9df77 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 9 Jan 2020 17:18:46 +0100 Subject: [PATCH] wip #3321 @0.25 --- resources/styles/michsci.styl | 3 ++ resources/views/layouts/app.blade.php | 21 +++++++------- webpack.mix.js | 40 +++++++++++++++++++-------- 3 files changed, 42 insertions(+), 22 deletions(-) create mode 100644 resources/styles/michsci.styl diff --git a/resources/styles/michsci.styl b/resources/styles/michsci.styl new file mode 100644 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 57992a7..9e6508b 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,21 +1,22 @@ @prepend('stylesheets') - - + +@if($variant==='MICHSCI') + +@endif + @endprepend @prepend('scripts') - - {{-- Automatic polyfills --}} - - +{{-- Automatic polyfills --}} + {{-- MMenu polyfills --}} - + - - + + {{-- Modernizr is built differently so can't use mix helper here. Todo: find a better way --}} - + @endprepend @include('cubist::head.htmldeclaration') diff --git a/webpack.mix.js b/webpack.mix.js index 3212a9d..da8f788 100644 --- 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 -- 2.39.5