From: Vincent Vanwaelscappel Date: Wed, 8 Apr 2020 18:04:03 +0000 (+0200) Subject: wip #3576 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=91c6a577330cc61145e3c362963f935c4eb1093a;p=pmi.git wip #3576 @0.5 --- diff --git a/app/Console/Commands/CreateCategoryPages.php b/app/Console/Commands/CreateCategoryPages.php index 70c1299..814d5de 100644 --- a/app/Console/Commands/CreateCategoryPages.php +++ b/app/Console/Commands/CreateCategoryPages.php @@ -15,7 +15,7 @@ class CreateCategoryPages extends Command public function handle() { - CMSPage::where('id', '>', 45)->delete(); + // CMSPage::where('id', '>', 45)->delete(); foreach (ProductType::all() as $item) { $data = $item->getPageData(true); $page = new CMSPage(); diff --git a/resources/styles/common/setup.styl b/resources/styles/common/setup.styl index 8e829f4..f5d7b98 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 = 1480px // This needs to match the MMenu activation setting in menu.js +$breakpoint-menu = 1300px // 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/resources/views/partials/contact-shortcut.blade.php b/resources/views/partials/contact-shortcut.blade.php index 4705042..7477f72 100644 --- a/resources/views/partials/contact-shortcut.blade.php +++ b/resources/views/partials/contact-shortcut.blade.php @@ -1,10 +1,10 @@
- + {{ __('Téléphone') }} {{ $global->phone }}
- + {{ __('Contact') }} {!! __('Formulaire de contact') !!} diff --git a/tailwind-michsci.config.js b/tailwind-michsci.config.js index d4d0f54..402697e 100644 --- a/tailwind-michsci.config.js +++ b/tailwind-michsci.config.js @@ -4,6 +4,7 @@ let config = require('./tailwind.config'); // PMI configuration as the basis config.theme.extend.colors = { ...config.theme.extend.colors, 'primary': '#ec2645', + 'contactshortcut': '#ec2645', }; module.exports = config; diff --git a/tailwind.config.js b/tailwind.config.js index 1b5c69e..9997f14 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -16,6 +16,7 @@ module.exports = { extend: { colors: { 'inherit': 'inherit', + 'contactshortcut':'#E72A63', 'primary': '#0EAADA', 'navy': '#152F4E', 'navy-dark': '#0C213A',