Merge branch 'feature/update-tailwind' of github.com:rapidez/core into feature/update-tailwind

JimmyHoenderdaal · JimmyHoenderdaal · commit 5dc08ea1f6c8 · 2024-09-06T14:04:16.000+02:00
diff --git a/resources/views/cart/coupon.blade.php b/resources/views/cart/coupon.blade.php
@@ -1,7 +1,7 @@
 <div class="bg-white rounded-lg border p-3">
-    <h3 class="text-lg leading-6 font-medium text-gray-900 mb-5">
+    <x-rapidez::title tag="h3" class="text-lg leading-6 font-medium text-neutral mb-5">
         @lang('Apply coupon code')
-    </h3>
+    </x-rapidez::title>
 
     @include('rapidez::cart.coupon.add')
     @include('rapidez::cart.coupon.list')
diff --git a/resources/views/cart/overview.blade.php b/resources/views/cart/overview.blade.php
@@ -6,7 +6,9 @@
 
 @section('content')
     <div class="container">
-        <h1 class="mb-5 text-4xl font-bold">@lang('Cart')</h1>
+        <x-rapidez::title tag="h1" class="mb-5 text-4xl">
+            @lang('Cart')
+        </x-rapidez::title>
         <graphql
             v-if="mask"
             :query="'query getCart($cart_id: String!) { cart (cart_id: $cart_id) { ' + config.queries.cart + ' } }'"
diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
@@ -8,7 +8,7 @@
 @section('content')
     <div class="container">
         @include('rapidez::category.partials.breadcrumbs')
-        <h1 class="mb-5 text-3xl font-bold">{{ $category->name }}</h1>
+        <x-rapidez::title tag="h1" class="mb-5 text-3xl">{{ $category->name }}</x-rapidez::title>
 
         @if ($category->is_anchor)
             <x-rapidez::listing query="{ bool: { must: [{ terms: { visibility: [2, 4] } }, { terms: { category_ids: [config.category.entity_id] } }] } }" />
diff --git a/resources/views/checkout/steps/credentials.blade.php b/resources/views/checkout/steps/credentials.blade.php
@@ -1,4 +1,4 @@
-<h1 class="mb-5 text-4xl font-bold">@lang('Credentials')</h1>
+<x-rapidez::title tag="h1" class="mb-5 text-4xl">@lang('Credentials')</x-rapidez::title>
 
 <form v-on:submit.prevent="save(['credentials'], 3)" class="flex flex-col gap-5 rounded bg-highlight p-4 md:p-8">
     <div class="flex flex-col gap-2">
diff --git a/resources/views/checkout/steps/login.blade.php b/resources/views/checkout/steps/login.blade.php
@@ -1,7 +1,7 @@
 <login v-slot="{ email, password, go, loginInputChange, emailAvailable }">
     <div class="flex justify-center">
         <form class="p-8 w-[400px]" v-on:submit.prevent="go()">
-            <h1 class="font-bold text-4xl text-center mb-5">@lang('Checkout')</h1>
+            <x-rapidez::title tag="h1" class="text-4xl text-center mb-5">@lang('Checkout')</x-rapidez::title>
 
             <x-rapidez::input
                 :label="false"
diff --git a/resources/views/checkout/steps/payment.blade.php b/resources/views/checkout/steps/payment.blade.php
@@ -1,6 +1,6 @@
 @php($checkoutAgreements = \Rapidez\Core\Models\CheckoutAgreement::all())
 
-<h1 class="font-bold text-4xl mb-5">@lang('Payment method')</h1>
+<x-rapidez::title tag="h1" class="text-4xl mb-5">@lang('Payment method')</x-rapidez::title>
 <form class="bg-highlight p-8 rounded mt-6" v-on:submit.prevent="save(['payment_method'], 4)">
     <div class="my-2 border bg-white p-4 rounded" v-for="(method, index) in checkout.payment_methods">
         <x-rapidez::radio
diff --git a/resources/views/checkout/steps/success.blade.php b/resources/views/checkout/steps/success.blade.php
@@ -1,7 +1,7 @@
 <checkout-success>
     <template slot-scope="{ order, hideBilling, shipping, billing, items }">
         <div dusk="checkout-success" v-cloak v-if="order">
-            <h1 class="font-bold text-4xl mb-5">@lang('Order placed succesfully')</h1>
+            <x-rapidez::title tag="h1" class="text-4xl mb-5">@lang('Order placed succesfully')</x-rapidez::title>
             <div class="bg-highlight rounded p-8">
                 <p>@lang('We will get to work for you right away')</p>
                 <p>@lang('We will send a confirmation of your order to') <span class="font-bold">@{{ order.customer_email }}</span></p>
diff --git a/resources/views/components/title/base.blade.php b/resources/views/components/title/base.blade.php
@@ -0,0 +1,4 @@
+@props(['tag' => 'div'])
+<x-tag :is="$tag" {{ $attributes->class('text-pretty') }}>
+    {!! $slot !!}
+</x-tag>
diff --git a/resources/views/components/title/index.blade.php b/resources/views/components/title/index.blade.php
@@ -0,0 +1,3 @@
+<x-rapidez::title.base {{ $attributes->class('font-sans font-bold') }}>
+    {{ $slot }}
+</x-rapidez::title.base>
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
@@ -16,7 +16,7 @@
 
 @section('content')
     <div class="container">
-        <h1 class="mb-5 text-4xl font-bold">{{ $page->content_heading }}</h1>
+        <x-rapidez::title tag="h1" class="mb-5 text-4xl">{{ $page->content_heading }}</x-rapidez::title>
         <div class="prose prose-green mb-5">
             {!! $page->content !!}
         </div>
diff --git a/resources/views/layouts/partials/footer/newsletter.blade.php b/resources/views/layouts/partials/footer/newsletter.blade.php
@@ -1,5 +1,5 @@
 <div class="mt-4 md:mt-0 text-inactive">
-    <h3 class="text-base font-bold">@lang('Want product news and updates?')</h3>
+    <x-rapidez::title tag="h3" class="text-base">@lang('Want product news and updates?')</x-rapidez::title>
     <p class="mt-4 text-base">@lang('Sign up for our newsletter to stay up to date.')</p>
     <div class="sm:w-full sm:max-w-md xl:mt-0" dusk="newsletter">
         <lazy>
@@ -15,7 +15,7 @@
                                 name="email"
                                 type="email"
                                 v-model="variables.email"
-                                class="w-full min-w-0 appearance-none rounded-md border h-10 border-text-inactive bg-white py-2 px-4 text-base text-gray-900 placeholder-text-neutral shadow-sm focus:border-indigo-500 focus:placeholder-gray-400 focus:outline-none focus:ring-indigo-500"
+                                class="w-full min-w-0 appearance-none rounded-md border h-10 border-text-inactive bg-white py-2 px-4 text-base text-neutral placeholder-text-neutral shadow-sm focus:border-indigo-500 focus:placeholder-gray-400 focus:outline-none focus:ring-indigo-500"
                                 wrapperClass="flex-grow"
                                 dusk="newsletter-email"
                                 autocomplete="email"
diff --git a/resources/views/listing/partials/filter/boolean.blade.php b/resources/views/listing/partials/filter/boolean.blade.php
@@ -3,7 +3,7 @@
     :component-id="filter.code"
     :data-field="filter.code+(filter.type != 'int' ? '.keyword' : '')"
     :inner-class="{
-        title: 'capitalize text-sm font-medium text-gray-900',
+        title: 'capitalize text-sm font-medium text-neutral',
         count: 'text-gray-400',
         list: '!max-h-full',
         label: 'ml-1 text-sm text-gray-600'
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
@@ -6,7 +6,7 @@
     :react="{and: ['query-filter']}"
     :show-filter="false"
     :inner-class="{
-        title: 'capitalize text-sm font-medium text-gray-900',
+        title: 'capitalize text-sm font-medium text-neutral',
     }"
     :slider-options="{ dragOnClick: true, useKeyboard: false }"
     u-r-l-params
diff --git a/resources/views/listing/partials/filter/swatch.blade.php b/resources/views/listing/partials/filter/swatch.blade.php
@@ -3,7 +3,7 @@
     :component-id="filter.code"
     :data-field="filter.super ? 'super_' + filter.code : filter.code"
     :inner-class="{
-        title: 'capitalize text-sm font-medium text-gray-900',
+        title: 'capitalize text-sm font-medium text-neutral',
         list: '!max-h-full flex flex-wrap',
     }"
     :title="filter.name.replace('_', ' ')"
diff --git a/resources/views/listing/partials/item.blade.php b/resources/views/listing/partials/item.blade.php
@@ -16,7 +16,7 @@ class="mb-3 h-48 w-full rounded-t object-contain" :alt="item.name" :loading="con
                 />
                 <x-rapidez::no-image v-else class="mb-3 h-48 rounded-t" />
                 <div class="px-2">
-                    <div class="text-base font-medium text-gray-900">@{{ item.name }}</div>
+                    <div class="text-base font-medium text-neutral">@{{ item.name }}</div>
                     @if (!Rapidez::config('catalog/frontend/show_swatches_in_product_list', 1))
                         <div class="flex items-center space-x-2">
                             <div class="font-semibold">@{{ (item.special_price || item.price) | price }}</div>
diff --git a/resources/views/page/overview.blade.php b/resources/views/page/overview.blade.php
@@ -6,7 +6,7 @@
 @section('content')
     <div class="container">
         @if ($page->identifier != 'home' && $page->content_heading)
-            <h1 class="mb-5 text-4xl font-bold">{{ $page->content_heading }}</h1>
+            <x-rapidez::title tag="h1" class="mb-5 text-4xl">{{ $page->content_heading }}</x-rapidez::title>
         @endif
         @includeIf('pages.' . $page->identifier)
         @if ($page->content)
diff --git a/resources/views/product/partials/addtocart.blade.php b/resources/views/product/partials/addtocart.blade.php
@@ -1,6 +1,6 @@
 <add-to-cart :default-qty="{{ $product->min_sale_qty > $product->qty_increments ? $product->min_sale_qty : $product->qty_increments }}" v-slot="addToCart">
     <form v-on:submit.prevent="addToCart.add" class="flex flex-col gap-5">
-        <h1 class="text-3xl font-bold" itemprop="name">{{ $product->name }}</h1>
+        <x-rapidez::title tag="h1" class="text-3xl" itemprop="name">{{ $product->name }}</x-rapidez::title>
         @if (!$product->in_stock && $product->backorder_type === 0)
             <p class="text-red-600">@lang('Sorry! This product is currently out of stock.')</p>
         @else
diff --git a/resources/views/product/partials/images.blade.php b/resources/views/product/partials/images.blade.php
@@ -42,10 +42,10 @@ class="max-h-full max-w-full"
                     />
                 </a>
                 <button class="{{ config('rapidez.frontend.z-indexes.lightbox') }} top-1/2 left-3 -translate-y-1/2" :class="zoomed ? 'fixed' : 'absolute'" v-if="active" v-on:click="change(active-1)" aria-label="@lang('Prev')">
-                    <x-heroicon-o-chevron-left class="h-8 w-8 text-gray-900" />
+                    <x-heroicon-o-chevron-left class="h-8 w-8 text-neutral" />
                 </button>
                 <button class="{{ config('rapidez.frontend.z-indexes.lightbox') }} top-1/2 right-3 -translate-y-1/2" :class="zoomed ? 'fixed' : 'absolute'" v-if="active != images.length-1" v-on:click="change(active+1)" aria-label="@lang('Next')">
-                    <x-heroicon-o-chevron-right class="h-8 w-8 text-gray-900" />
+                    <x-heroicon-o-chevron-right class="h-8 w-8 text-neutral" />
                 </button>
             </div>
             <x-rapidez::no-image v-else class="h-96 rounded" />
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
@@ -6,7 +6,7 @@
 
 @section('content')
     <div class="container">
-        <h1 class="font-bold text-3xl">@lang('Search for'): {{ request()->q }}</h1>
+        <x-rapidez::title tag="h1" class="text-3xl">@lang('Search for'): {{ request()->q }}</x-rapidez::title>
         <x-rapidez::listing query="{
             bool: {
                 must: [

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<h1 class="mb-5 text-4xl font-bold">@lang('Credentials')</h1>`
	`1`	`+<x-rapidez::title tag="h1" class="mb-5 text-4xl">@lang('Credentials')</x-rapidez::title>`
`2`	`2`
`3`	`3`	`<form v-on:submit.prevent="save(['credentials'], 3)" class="flex flex-col gap-5 rounded bg-highlight p-4 md:p-8">`
`4`	`4`	`<div class="flex flex-col gap-2">`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<x-rapidez::title.base {{ $attributes->class('font-sans font-bold') }}>`
	`2`	`+ {{ $slot }}`
	`3`	`+</x-rapidez::title.base>`