wip #2757 @4

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index 8e8084b2e133a799312c1152c3d0a3e4e3d0eab2..940c93f95d61e198ec4e13409d15e74240a3361c 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -55,15 +55,32 @@ class AjaxController extends CubistFrontController
         Mail::raw(implode("\r\n", $contents), function ($message) use ($validatedData, $page) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->sender(config('mail.from.address'), config('mail.from.name'));
-            foreach ($page->form_destination as $item) {
-                $message->to($item);
+            $message->bcc('test+pmi@cubedesigners.com');
+            if (null === $page->form_destination) {
+                $message->to('web@pm-instrumentation.com');
+            } else {
+                foreach ($page->form_destination as $item) {
+                    $message->to($item);
+                }
             }
             $subject = '';
             if ($page->form_prefix) {
                 $subject = '[' . $page->form_prefix . '] ';
             }
 
-            $message->replyTo($validatedData['email']);
+            $sender = '';
+            if (isset($validatedData['firstname'])) {
+                $sender .= $validatedData['firstname'];
+            }
+            if (isset($validatedData['name'])) {
+                $sender .= ' ' . $validatedData['name'];
+            }
+            $sender = trim($sender);
+            if (!$sender) {
+                $sender = null;
+            }
+
+            $message->replyTo($validatedData['email'], $sender);
             $message->subject($subject . $validatedData['subject']);
         });
 

diff --git a/resources/styles/common/headings.styl b/resources/styles/common/headings.styl
index 56570d800e75e4b0a9889b83032e7f97225a14f4..a6ae55bf1a30ecdb5874705a54046b139f23f869 100644 (file)
--- a/resources/styles/common/headings.styl
+++ b/resources/styles/common/headings.styl
@@ -4,7 +4,7 @@ h1, h2, h3, h4
   margin-bottom: 1em
   @apply text-navy font-display font-semibold
 
-.h1, .h2
+.h1, .h2, .markdown h1, .markdown h2
   @apply leading-tight relative
 
   &:not(.simple):after
@@ -12,7 +12,7 @@ h1, h2, h3, h4
     display: block
     background-color: theme('colors.blue')
 
-.h1
+.h1, .markdown h1
   @apply text-6xl
 
   &:after
@@ -26,7 +26,7 @@ h1, h2, h3, h4
   +below(1000px)
     @apply text-4xl
 
-.h2
+.h2, .markdown h2
   @apply text-4xl
 
   &:after
@@ -34,3 +34,4 @@ h1, h2, h3, h4
     constrain(margin-bottom, 1vw)
     constrain(width, 2.5vw)
     height: 4px
+

diff --git a/resources/styles/components/form.styl b/resources/styles/components/form.styl
index 930ef71c72039ae42a364242fc5ac167971ffd84..8386dd1bd3a8e9d66731cb2ad08451cbe2a3c1dd 100644 (file)
--- a/resources/styles/components/form.styl
+++ b/resources/styles/components/form.styl
@@ -13,7 +13,7 @@ $verylightgrey = #E7E9F3
 
     .fields
       grid-column-gap: 30px
-      grid-template-columns: repeat(auto-fit, minmax(270px, 2fr));
+      grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
 
     .errormessage
       color: #cc0000;
@@ -39,9 +39,8 @@ $verylightgrey = #E7E9F3
       position: relative
       padding-top: 15px
       display: block
-      grid-column 1 / span 2
-      &.half
-        grid-column auto
+      &:not(.half)
+        grid-column 1 / -1
 
     .textarea
       height 144px
@@ -52,7 +51,8 @@ $verylightgrey = #E7E9F3
       margin-bottom: 20px;
 
     .btn-custom
-      padding 1.125rem 5.375rem
+      min-width 14rem
+      padding 1.125rem 3.375rem
 
 
     *:focus

diff --git a/resources/views/pages/services.blade.php b/resources/views/pages/services.blade.php
index 684b2deab12515d73036fe4ab4125c6378ec595f..9e54e15631671a11b2fcb5ddd978846ab9023596 100644 (file)
--- a/resources/views/pages/services.blade.php
+++ b/resources/views/pages/services.blade.php
@@ -6,7 +6,7 @@
         <content>
             <columns>
                 <column>
-                    <text-block>
+                    <text-block padding="text-block-default-padding pl-2v pr-1v">
                         @markdown($page->content)
                     </text-block>