Feature/v3 colors and tweaks #31

jordythevulder · 2024-12-17T16:12:57Z

Implemented v3 and various tweaks

resources/views/checkout/partials/buttons/address.blade.php

royduin · 2024-12-18T07:27:56Z

resources/views/checkout/partials/sections/success/product-quantity.blade.php

@@ -1,5 +1,5 @@
 <div class="flex items-center justify-between gap-10 font-medium max-md:flex-1 md:ml-auto">
-    <div class="h-12 w-16 border flex items-center rounded-md justify-center text-ct-neutral ring ring-ct-inactive-100 text-base">
+    <div class="h-12 w-16 border flex items-center rounded-md justify-center ring ring-background text-base">


Ok for now, internal reference: RAP-1079

This is within the core now, maybe search and replace all -backgrounds?

resources/views/checkout/partials/sections/success/summary.blade.php

resources/views/checkout/partials/sidebar/products.blade.php

resources/views/components/address-form.blade.php

resources/views/components/input/checkbox/checkbox.blade.php

resources/views/components/input/checkbox/tile.blade.php

resources/views/components/input/input.blade.php

resources/views/components/input/label.blade.php

royduin · 2024-12-18T07:45:18Z

And the readme needs an update.

resources/views/cart/cart.blade.php

resources/views/checkout/partials/sections/login/logged-out.blade.php

resources/views/components/slide-in/receipt.blade.php

resources/views/checkout/partials/sections/success/summary.blade.php

resources/views/components/input/select/select.blade.php

resources/views/components/input/select/country.blade.php

…fira into feature/v3-colors-and-tweaks

resources/views/checkout/partials/sections/success/summary.blade.php

resources/views/checkout/steps/success.blade.php

resources/views/components/input/input.blade.php

resources/views/components/input/password/password.blade.php

resources/views/components/address-form.blade.php

royduin · 2025-01-14T11:06:47Z

Does it depend on a specific version of one of these?

rapidez/checkout-theme
rapidez/core
rapidez/blade-components

The currently only dependency is: "rapidez/checkout-theme": "^3.0", so with just rapidez/checkout-theme version 3.0.0 everything works?

jordythevulder · 2025-01-14T14:31:14Z

Does it depend on a specific version of one of these?

rapidez/checkout-theme

rapidez/core

rapidez/blade-components

The currently only dependency is: "rapidez/checkout-theme": "^3.0", so with just rapidez/checkout-theme version 3.0.0 everything works?

I've used these versions locally
Checkout theme dev-master as 3.0
Core dev-master as 3.0
Blade components dev-master as 1.2.0

royduin · 2025-01-15T12:46:14Z

Let's wait for rapidez/checkout-theme#160 to be merged and tagged as this depends on it.

jordythevulder · 2025-01-29T15:43:28Z

Found a few classes that weren't necessary, also double checked the PR. Looks good to me :)

…olors-and-tweaks

Roene-JustBetter · 2025-02-25T08:25:08Z

Fixed merge conflict.
Added sorting for country select.
Checked translations and added / removed it.

With the fixes above this PR should be ready for merge 🚀

jordythevulder · 2025-02-25T12:15:15Z

Fixed merge conflict.

Added sorting for country select.

Checked translations and added / removed it.

With the fixes above this PR should be ready for merge 🚀

Perfect! looks great :)

royduin · 2025-02-26T07:34:18Z

resources/views/checkout/partials/address-cards-popup.blade.php

@@ -9,5 +9,5 @@
            @include('rapidez-ct::checkout.partials.address-card')
        </x-rapidez-ct::card.inactive>
    </x-rapidez-ct::sections>
-    <label class="absolute cursor-pointer inset-0 bg-ct-neutral/60" for="popup"></label>
+    <label class="absolute cursor-pointer inset-0 bg-black/60" for="popup"></label>


Is this a backdrop? In that case we do have a backdrop color for that.

royduin · 2025-02-26T07:36:37Z

resources/views/checkout/partials/sections/success/summary.blade.php

+    </dl>
+    <dl v-if="order.grand_total" class="flex items-center order-last justify-between border-t border-dashed pt-3 mt-4">


Why do we need 2 dl's? Can't we have everything in one dl?

royduin · 2025-02-26T07:37:22Z

resources/views/checkout/partials/shipping/methods.blade.php

+                />
+            </div>
+            </x-rapidez-ct::input.radio.tile>


Is this indenting right?

royduin · 2025-02-26T07:38:59Z

resources/views/checkout/partials/sidebar/products.blade.php

@@ -21,7 +34,7 @@
                </div>
            </div>
        </div>
-        <button v-if="cart.items.length > 2" class="mt-2 flex items-center pb-1 gap-1 text-ct-inactive font-medium" @click="toggle">
+        <button v-if="cart.items.length > 2" class="flex items-center pb-1 gap-1 !border-t-0 !pt-0 hover:underline" @click="toggle">


Importants on a default button?

Yes this is because of the wrapping <div class="*:pt-2.5 first:*:pt-0 mb-2.5 flex w-full flex-col gap-2.5 divide-y divide-dashed border-b border-dashed pb-2.5"> that sets borders between the elements.

The button here as you can see below doesn't need a border as that looks weird:

royduin · 2025-02-26T07:39:51Z

resources/views/checkout/steps/success.blade.php

@@ -7,7 +7,7 @@
            </x-rapidez-ct::title>

            <x-rapidez-ct::sections>
-                <x-rapidez-ct::card.inactive class="!bg-ct-primary-100 py-8 px-6 rounded-xl border-b border-black/5">
+                <x-rapidez-ct::card.inactive class="!bg-green-400/15 px-7 !py-5 rounded-xl border-b border-black/5">


Aren't we using the Tailwind merging so we don't need any importants?

I checked the importants. For the background we don't need the !important so we can remove it. For the padding we need the important because of the wrapping parent divide-y divide-dashed *:pt-6 *:mb-6 mt-5 mb-6 first:*:pt-0.

royduin · 2025-02-26T07:43:13Z

resources/views/components/card/white.blade.php

@@ -1,9 +1,9 @@
 @props(['check' => false])
-<div {{ $attributes->class('relative flex-1 rounded-md border bg-white px-5 py-6 overflow-hidden ring ring-ct-inactive-100') }}>
+<div {{ $attributes->class('relative flex-1 rounded-md border bg-white px-6 py-5 overflow-hidden ring ring-background') }}>


ring-background? Shouldn't that be ring-muted?

royduin · 2025-02-26T07:43:56Z

resources/views/components/card/address-alt.blade.php

@@ -1,6 +1,6 @@
 @props(['customTitle' => null])

-<x-rapidez-ct::card.white class="!border-0 !shadow-none !p-0" {{ $attributes->only('v-if') }}>
+<x-rapidez-ct::card.white class="!border-0 !shadow-none !p-0 !ring-0" {{ $attributes->only('v-if') }}>


We need to add twMerge so we don't need the importants

royduin · 2025-02-26T07:46:17Z

resources/views/components/input/select/select.blade.php

@@ -0,0 +1,7 @@
+<select {{ $attributes
+    ->except(['v-if', 'v-else', 'v-else-if', 'class'])
+    ->class('w-full cursor-pointer border border-default focus:border-emphasis bg-white pt-7 pb-2.5 px-5 text-sm font-medium rounded-m bg-white outline-none transition-all disabled:bg-emphasis !ring !ring-background focus:!ring-background-emphasis rounded-md') }}>


ring-background-emphasis => ring / ring-default?

jordythevulder added 2 commits December 17, 2024 14:32

Implemented primer and various tweaks

45c841f

V3 colors implementation and various tweaks

77391bd

jordythevulder requested review from Roene-JustBetter and JimmyHoenderdaal December 17, 2024 16:12

royduin requested changes Dec 18, 2024

View reviewed changes

JimmyHoenderdaal requested changes Dec 18, 2024

View reviewed changes

resources/views/cart/cart.blade.php Outdated Show resolved Hide resolved

Roene-JustBetter requested changes Dec 18, 2024

View reviewed changes

Jade-GG and others added 7 commits January 3, 2025 11:51

Fix item removal

84064af

Carry attributes over to select input

29ae511

Only show slide-in when cart exists to avoid errors

bb96447

Remove pickup address

0498648

Show configured variant image in the cart (#33)

c1a63cd

Resolved feedback

ccfd41f

Merge branch 'feature/v3-colors-and-tweaks' of github.com:rapidez/con…

71be9bd

…fira into feature/v3-colors-and-tweaks

jordythevulder requested review from JimmyHoenderdaal and Roene-JustBetter January 9, 2025 10:51

Roene-JustBetter requested changes Jan 9, 2025

View reviewed changes

resources/views/checkout/partials/sections/success/summary.blade.php Outdated Show resolved Hide resolved

resources/views/checkout/steps/success.blade.php Outdated Show resolved Hide resolved

Roene-JustBetter reviewed Jan 9, 2025

View reviewed changes

resources/views/components/input/input.blade.php Outdated Show resolved Hide resolved

Roene-JustBetter reviewed Jan 9, 2025

View reviewed changes

resources/views/components/input/password/password.blade.php Outdated Show resolved Hide resolved

jordythevulder added 2 commits January 10, 2025 10:48

Restructured inputs

245635f

removed commented code

a46a173

jordythevulder requested a review from Roene-JustBetter January 10, 2025 09:58

Roene-JustBetter requested changes Jan 10, 2025

View reviewed changes

resources/views/components/address-form.blade.php Show resolved Hide resolved

Roene-JustBetter previously approved these changes Jan 13, 2025

View reviewed changes

resolved merge conflict

59c5191

jordythevulder dismissed Roene-JustBetter’s stale review via 59c5191 January 13, 2025 08:54

Roene-JustBetter previously approved these changes Jan 13, 2025

View reviewed changes

JimmyHoenderdaal previously approved these changes Jan 14, 2025

View reviewed changes

Tweaked classes

0b02065

jordythevulder dismissed stale reviews from JimmyHoenderdaal and Roene-JustBetter via 0b02065 January 29, 2025 15:41

jordythevulder requested review from Roene-JustBetter, JimmyHoenderdaal and royduin January 29, 2025 15:41

Merge branch 'master' of github.com:rapidez/confira into feature/v3-c…

41f8583

…olors-and-tweaks

Roene-JustBetter approved these changes Feb 25, 2025

View reviewed changes

royduin reviewed Feb 26, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/v3 colors and tweaks #31

Feature/v3 colors and tweaks #31

jordythevulder commented Dec 17, 2024

royduin Dec 18, 2024

royduin Feb 26, 2025

royduin commented Dec 18, 2024

royduin commented Jan 14, 2025

jordythevulder commented Jan 14, 2025

royduin commented Jan 15, 2025

jordythevulder commented Jan 29, 2025 •

edited

Loading

Roene-JustBetter commented Feb 25, 2025

jordythevulder commented Feb 25, 2025

royduin Feb 26, 2025

royduin Feb 26, 2025

royduin Feb 26, 2025

royduin Feb 26, 2025

Roene-JustBetter Feb 26, 2025

royduin Feb 26, 2025

Roene-JustBetter Feb 26, 2025

royduin Feb 26, 2025

royduin Feb 26, 2025

royduin Feb 26, 2025

		</dl>
		<dl v-if="order.grand_total" class="flex items-center order-last justify-between border-t border-dashed pt-3 mt-4">

Feature/v3 colors and tweaks #31

Are you sure you want to change the base?

Feature/v3 colors and tweaks #31

Conversation

jordythevulder commented Dec 17, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

royduin commented Dec 18, 2024

royduin commented Jan 14, 2025

jordythevulder commented Jan 14, 2025

royduin commented Jan 15, 2025

jordythevulder commented Jan 29, 2025 • edited Loading

Roene-JustBetter commented Feb 25, 2025

jordythevulder commented Feb 25, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jordythevulder commented Jan 29, 2025 •

edited

Loading