wip #3576 @0.5

diff --git a/app/Console/Commands/CreateCategoryPages.php b/app/Console/Commands/CreateCategoryPages.php
index 70c12991ef0a4793a8773350b5731fd5992589d8..814d5de30f8f059a7a1301e01e67bd573f9d2850 100644 (file)
--- 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 8e829f4c0463d338f89dd3b648fc4145d769b6dc..f5d7b98b7ec58c4b948b46036dfc9a50d2f21b85 100644 (file)
--- 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 47050424f0d3380fca1aa588306fcd78e3ca29e0..7477f721f4edb738c35335e80ff09ea33e177459 100644 (file)
--- a/resources/views/partials/contact-shortcut.blade.php
+++ b/resources/views/partials/contact-shortcut.blade.php
@@ -1,10 +1,10 @@
 <div class="contact-shortcut flex flex-col z-30 xs:hidden">
-    <phone-link :number="$global->phone" class="contact-shortcut-tab mb-px inline-flex self-start bg-primary p-3 pr-10">
+    <phone-link :number="$global->phone" class="contact-shortcut-tab mb-px inline-flex self-start bg-contactshortcut p-3 pr-10">
         <img class="contact-shortcut-icon" src="{{ asset('images/icon-phone.svg') }}" alt="{{ __('Téléphone') }}">
         {{ $global->phone }}
     </phone-link>
     <div class="contact-shortcut-tab">
-        <a href="/contact" class="bg-primary p-3 bg-primary flex items-center pr-16">
+        <a href="/contact" class="p-3 bg-contactshortcut flex items-center pr-16">
             <img class="contact-shortcut-icon" src="{{ asset('images/icon-email.svg') }}" alt="{{ __('Contact') }}">
             {!! __('Formulaire de contact') !!}
         </a>

diff --git a/tailwind-michsci.config.js b/tailwind-michsci.config.js
index d4d0f54802016d3e7569a3e096b995750ee684cd..402697e8759e8c11169d0e32401caee40b110aa8 100644 (file)
--- 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 1b5c69e0bc3ab3627a2c26c1b14ac3153c9eddc3..9997f1428ab0197ba1edd70f80257e71471ee73e 100644 (file)
--- 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',