diff --git a/config/debugbar.php b/config/debugbar.php index 3275f105a..d1fcc58b0 100755 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -111,7 +111,7 @@ return [ 'views' => true, // Views with their data 'route' => true, // Current route information 'auth' => false, // Display Laravel authentication status - 'gate' => true, // Display Laravel Gate checks + 'gate' => true, // Display Laravel Gate checks 'session' => true, // Display session data 'symfony_request' => true, // Only one can be enabled.. 'mail' => true, // Catch mail messages @@ -122,7 +122,7 @@ return [ 'files' => false, // Show the included files 'config' => false, // Display config settings 'cache' => false, // Display cache events - 'models' => false, // Display models + 'models' => true, // Display models ], /* diff --git a/config/excel.php b/config/excel.php index 213afe571..fa3e12b28 100755 --- a/config/excel.php +++ b/config/excel.php @@ -179,7 +179,8 @@ return [ | in conjunction with queued imports and exports. | */ - 'remote_disk' => null, + 'remote_disk' => null, + 'remote_prefix' => null, ], ]; diff --git a/config/tinker.php b/config/tinker.php index 0d2bf00e7..0fdd538d6 100755 --- a/config/tinker.php +++ b/config/tinker.php @@ -17,6 +17,21 @@ return [ // App\Console\Commands\ExampleCommand::class, ], + /* + |-------------------------------------------------------------------------- + | Alias Whitelist + |-------------------------------------------------------------------------- + | + | Tinker will not automatically alias classes in your vendor namespaces + | but you may explicitly allow a subset of classes to get aliased by + | adding the names of each of those classes to the following list. + | + */ + + 'alias' => [ + // + ], + /* |-------------------------------------------------------------------------- | Alias Blacklist diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php index c82a0ddaa..698af7dc1 100644 --- a/packages/Webkul/Shop/src/Resources/lang/it/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php @@ -581,7 +581,7 @@ return [ 'subject' => 'Nuovo commento aggiunto al tuo ordine', 'dear' => ':customer_name', 'final-summary' => 'Grazie per aver mostrato interesse per il nostro store', - 'help' => 'Se hai bisogno di aiuto contattaci all'indirizzo :support_email', + 'help' => 'Se hai bisogno di aiuto contattaci all\'indirizzo :support_email', 'thanks' => 'Graze!', ], diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php index 7a0280c9b..c3ac7763f 100644 --- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php @@ -526,7 +526,7 @@ return [ 'total' => [ 'order-summary' => 'Podsumowanie zamówienia', - 'sub-total' => 'Produkty, + 'sub-total' => 'Produkty', 'grand-total' => 'Suma łączna', 'delivery-charges' => 'Koszty dostawy', 'tax' => 'Podatek', @@ -592,7 +592,7 @@ return [ 'discount' => 'Rabat', 'grand-total' => 'Suma łączna', 'final-summary' => 'Dziękujemy za zakupy w naszym sklepie', - 'help' => ''Jeśli potrzebujesz jakiejkolwiek pomocy, skontaktuj się z nami pod adresem :support_email', + 'help' => 'Jeśli potrzebujesz jakiejkolwiek pomocy, skontaktuj się z nami pod adresem :support_email', 'thanks' => 'Dzięki!', ] ], diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index 238eee330..acd38100a 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -2,4 +2,4 @@ @section('title', __('Service Unavailable')) @section('code', '503') -@section('message', __($exception->getMessage() ?: 'Srvice Unavailable')) +@section('message', __($exception->getMessage() ?: 'Service Unavailable')) diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php index d760329c1..e74fe55a7 100755 --- a/resources/views/vendor/mail/html/button.blade.php +++ b/resources/views/vendor/mail/html/button.blade.php @@ -7,7 +7,7 @@
-{{ $slot }} +{{ $slot }}
diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php index 79971d9e8..fa1875caa 100755 --- a/resources/views/vendor/mail/html/header.blade.php +++ b/resources/views/vendor/mail/html/header.blade.php @@ -1,7 +1,11 @@ - + +@if (trim($slot) === 'Laravel') + +@else {{ $slot }} +@endif diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css index e5a447178..350fb838f 100755 --- a/resources/views/vendor/mail/html/themes/default.css +++ b/resources/views/vendor/mail/html/themes/default.css @@ -2,25 +2,21 @@ body, body *:not(html):not(style):not(br):not(tr):not(code) { + box-sizing: border-box; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; - box-sizing: border-box; + position: relative; } body { - background-color: #f8fafc; - color: #74787e; + -webkit-text-size-adjust: none; + background-color: #ffffff; + color: #718096; height: 100%; - hyphens: auto; line-height: 1.4; margin: 0; - -moz-hyphens: auto; - -ms-word-break: break-all; + padding: 0; width: 100% !important; - -webkit-hyphens: auto; - -webkit-text-size-adjust: none; - word-break: break-all; - word-break: break-word; } p, @@ -43,14 +39,13 @@ a img { h1 { color: #3d4852; - font-size: 19px; + font-size: 18px; font-weight: bold; margin-top: 0; text-align: left; } h2 { - color: #3d4852; font-size: 16px; font-weight: bold; margin-top: 0; @@ -58,7 +53,6 @@ h2 { } h3 { - color: #3d4852; font-size: 14px; font-weight: bold; margin-top: 0; @@ -66,7 +60,6 @@ h3 { } p { - color: #3d4852; font-size: 16px; line-height: 1.5em; margin-top: 0; @@ -84,22 +77,22 @@ img { /* Layout */ .wrapper { - background-color: #f8fafc; - margin: 0; - padding: 0; - width: 100%; -premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; + background-color: #edf2f7; + margin: 0; + padding: 0; + width: 100%; } .content { - margin: 0; - padding: 0; - width: 100%; -premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; + margin: 0; + padding: 0; + width: 100%; } /* Header */ @@ -110,154 +103,176 @@ img { } .header a { - color: #bbbfc3; + color: #3d4852; font-size: 19px; font-weight: bold; text-decoration: none; - text-shadow: 0 1px 0 white; +} + +/* Logo */ + +.logo { + height: 75px; + width: 75px; } /* Body */ .body { - background-color: #ffffff; - border-bottom: 1px solid #edeff2; - border-top: 1px solid #edeff2; - margin: 0; - padding: 0; - width: 100%; -premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; + background-color: #edf2f7; + border-bottom: 1px solid #edf2f7; + border-top: 1px solid #edf2f7; + margin: 0; + padding: 0; + width: 100%; } .inner-body { - background-color: #ffffff; - margin: 0 auto; - padding: 0; - width: 570px; -premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 570px; + background-color: #ffffff; + border-color: #e8e5ef; + border-radius: 2px; + border-width: 1px; + box-shadow: 0 2px 0 rgba(0, 0, 150, 0.025), 2px 4px 0 rgba(0, 0, 150, 0.015); + margin: 0 auto; + padding: 0; + width: 570px; } /* Subcopy */ .subcopy { - border-top: 1px solid #edeff2; + border-top: 1px solid #e8e5ef; margin-top: 25px; padding-top: 25px; } .subcopy p { - font-size: 12px; + font-size: 14px; } /* Footer */ .footer { + -premailer-cellpadding: 0; + -premailer-cellspacing: 0; + -premailer-width: 570px; margin: 0 auto; padding: 0; text-align: center; width: 570px; - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 570px; } .footer p { - color: #aeaeae; + color: #b0adc5; font-size: 12px; text-align: center; } +.footer a { + color: #b0adc5; + text-decoration: underline; +} + /* Tables */ .table table { - margin: 30px auto; - width: 100%; -premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; + margin: 30px auto; + width: 100%; } .table th { border-bottom: 1px solid #edeff2; - padding-bottom: 8px; margin: 0; + padding-bottom: 8px; } .table td { color: #74787e; font-size: 15px; line-height: 18px; - padding: 10px 0; margin: 0; + padding: 10px 0; } .content-cell { - padding: 35px; + max-width: 100vw; + padding: 32px; } /* Buttons */ .action { + -premailer-cellpadding: 0; + -premailer-cellspacing: 0; + -premailer-width: 100%; margin: 30px auto; padding: 0; text-align: center; width: 100%; - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; } .button { - border-radius: 3px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16); + -webkit-text-size-adjust: none; + border-radius: 4px; color: #fff; display: inline-block; + overflow: hidden; text-decoration: none; - -webkit-text-size-adjust: none; } .button-blue, .button-primary { - background-color: #3490dc; - border-top: 10px solid #3490dc; - border-right: 18px solid #3490dc; - border-bottom: 10px solid #3490dc; - border-left: 18px solid #3490dc; + background-color: #2d3748; + border-bottom: 8px solid #2d3748; + border-left: 18px solid #2d3748; + border-right: 18px solid #2d3748; + border-top: 8px solid #2d3748; } .button-green, .button-success { - background-color: #38c172; - border-top: 10px solid #38c172; - border-right: 18px solid #38c172; - border-bottom: 10px solid #38c172; - border-left: 18px solid #38c172; + background-color: #48bb78; + border-bottom: 8px solid #48bb78; + border-left: 18px solid #48bb78; + border-right: 18px solid #48bb78; + border-top: 8px solid #48bb78; } .button-red, .button-error { - background-color: #e3342f; - border-top: 10px solid #e3342f; - border-right: 18px solid #e3342f; - border-bottom: 10px solid #e3342f; - border-left: 18px solid #e3342f; + background-color: #e53e3e; + border-bottom: 8px solid #e53e3e; + border-left: 18px solid #e53e3e; + border-right: 18px solid #e53e3e; + border-top: 8px solid #e53e3e; } /* Panels */ .panel { - margin: 0 0 21px; + border-left: #2d3748 solid 4px; + margin: 21px 0; } .panel-content { - background-color: #f1f5f8; + background-color: #edf2f7; + color: #718096; padding: 16px; } +.panel-content p { + color: #718096; +} + .panel-item { padding: 0; } @@ -267,26 +282,8 @@ img { padding-bottom: 0; } -/* Promotions */ +/* Utilities */ -.promotion { - background-color: #ffffff; - border: 2px dashed #9ba2ab; - margin: 0; - margin-bottom: 25px; - margin-top: 25px; - padding: 24px; - width: 100%; - -premailer-cellpadding: 0; - -premailer-cellspacing: 0; - -premailer-width: 100%; -} - -.promotion h1 { - text-align: center; -} - -.promotion p { - font-size: 15px; - text-align: center; +.break-all { + word-break: break-all; } diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php index 5de1e3537..e7a56b461 100755 --- a/resources/views/vendor/notifications/email.blade.php +++ b/resources/views/vendor/notifications/email.blade.php @@ -52,13 +52,11 @@ @slot('subcopy') @lang( "If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n". - 'into your web browser: [:displayableActionUrl](:actionURL)', + 'into your web browser:', [ 'actionText' => $actionText, - 'actionURL' => $actionUrl, - 'displayableActionUrl' => $displayableActionUrl, ] -) +) [{{ $displayableActionUrl }}]({{ $actionUrl }}) @endslot @endisset @endcomponent diff --git a/resources/views/vendor/pagination/simple-tailwind.blade.php b/resources/views/vendor/pagination/simple-tailwind.blade.php new file mode 100644 index 000000000..1c5e52f3e --- /dev/null +++ b/resources/views/vendor/pagination/simple-tailwind.blade.php @@ -0,0 +1,25 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/tailwind.blade.php b/resources/views/vendor/pagination/tailwind.blade.php new file mode 100644 index 000000000..4b92aaba1 --- /dev/null +++ b/resources/views/vendor/pagination/tailwind.blade.php @@ -0,0 +1,102 @@ +@if ($paginator->hasPages()) + +@endif