Skip to content

Small tweaks #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 4, 2024
Merged

Small tweaks #149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e64e29
Small tweaks
jordythevulder Dec 3, 2024
ec8d798
Frontend tweaks
jordythevulder Dec 3, 2024
ab73527
Reverted logo and added width and height
jordythevulder Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/views/components/card/address.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
@php
$attributes = $attributes->merge([
'v-bind:disabled' => var_export($disabled, true),
'v-bind:check' => var_export($check, true),
]);
@endphp
<x-rapidez-ct::card.white
<x-rapidez-ct::card.white
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Empty space.

{{ $attributes->only('v-if') }}
v-bind:class="{!! $attributes['v-bind:disabled'] !!} ? '!bg-ct-disabled !text-ct-inactive' : ''"
:$check
>
<x-rapidez-ct::address :$attributes :$customTitle>
{{ $slot }}
Expand Down
14 changes: 13 additions & 1 deletion resources/views/components/logo.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 300 300"><path fill="#2EBA86" d="M93.6 61.95h19.05c7.05 0 12.75 5.7 12.75 12.75s-5.7 12.75-12.75 12.75H93.6c-7.05 0-12.75-5.7-12.75-12.75S86.7 61.95 93.6 61.95ZM46.05 162.6h60.3c7.05 0 12.75 5.7 12.75 12.75s-5.7 12.75-12.75 12.75h-60.3c-7.05 0-12.75-5.7-12.75-12.75 0-7.35 5.7-12.75 12.75-12.75Z"/><path fill="#203F60" fill-opacity=".95" d="M244.5 61.95h-93.75c-7.05 0-12.75 5.7-12.75 12.75 0 6 4.5 11.1 10.2 12.45h20.85c5.7 1.2 10.2 6.3 10.2 12.45 0 7.05-5.7 12.75-12.75 12.75H84.75c-5.7 1.2-10.2 6.3-10.2 12.45 0 6.15 4.5 11.1 10.2 12.45h88.35c7.05 0 12.75 5.7 12.75 12.75s-5.7 12.75-12.75 12.75h-31.2c-5.7 1.2-10.2 6.3-10.2 12.45 0 6.15 4.5 11.1 10.2 12.45h12c.9 0 1.65 0 2.55.3.3 0 .3 0 .6.3.6 0 .9.3 1.65.3.3 0 .6.3.9.3.3.3.9.3 1.2.6.3.3.6.3.9.6l.9.9.6.6.9.9c.3.3.3.6.6.9.3.3.3.9.6 1.2 0 .3.3.6.3.9.3.6.3.9.3 1.65 0 .3 0 .6.3.6 0 .6.3 1.65.3 2.55 0 7.05-5.7 12.75-12.75 12.75H33.3c-.9 0-1.65 0-2.55-.3h-16.5c-7.05 0-12.75 5.7-12.75 12.75s5.7 12.75 12.75 12.75H184.2l11.7-66.45h10.2l24.75 66.45h48.3l-28.2-70.2c28.65-7.95 44.55-28.95 48.3-50.85 5.7-30.45-11.55-55.2-54.75-55.2Zm10.8 57.15c-2.55 13.65-11.4 22.2-27.6 22.2H201l7.65-44.1h26.7c16.5 0 22.5 8.55 19.95 21.9Z"/></svg>

<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_10342_2)">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd some issues with ID's here when the logo is used 2+ times on a page. @JimmyHoenderdaal knows more on that.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've reverted the old logo back and added the width and height attributes

<path d="M93.6 61.95H112.65C119.7 61.95 125.4 67.6499 125.4 74.6999C125.4 81.7499 119.7 87.4499 112.65 87.4499H93.6C86.55 87.4499 80.85 81.7499 80.85 74.6999C80.85 67.6499 86.7 61.95 93.6 61.95ZM46.05 162.6H106.35C113.4 162.6 119.1 168.3 119.1 175.35C119.1 182.4 113.4 188.1 106.35 188.1H46.05C39 188.1 33.3 182.4 33.3 175.35C33.3 168 39 162.6 46.05 162.6Z" fill="#2EBA86"/>
<path d="M244.5 61.95H150.75C143.7 61.95 138 67.6499 138 74.6999C138 80.6999 142.5 85.8 148.2 87.15H169.05C174.75 88.35 179.25 93.4499 179.25 99.5999C179.25 106.65 173.55 112.35 166.5 112.35H84.75C79.05 113.55 74.55 118.65 74.55 124.8C74.55 130.95 79.05 135.9 84.75 137.25H173.1C180.15 137.25 185.85 142.95 185.85 150C185.85 157.05 180.15 162.75 173.1 162.75H141.9C136.2 163.95 131.7 169.05 131.7 175.2C131.7 181.35 136.2 186.3 141.9 187.65H153.9C154.8 187.65 155.55 187.65 156.45 187.95C156.75 187.95 156.75 187.95 157.05 188.25C157.65 188.25 157.95 188.55 158.7 188.55C159 188.55 159.3 188.85 159.6 188.85C159.9 189.15 160.5 189.15 160.8 189.45C161.1 189.75 161.4 189.75 161.7 190.05L162.6 190.95L163.2 191.55L164.1 192.45C164.4 192.75 164.4 193.05 164.7 193.35C165 193.65 165 194.25 165.3 194.55C165.3 194.85 165.6 195.15 165.6 195.45C165.9 196.05 165.9 196.35 165.9 197.1C165.9 197.4 165.9 197.7 166.2 197.7C166.2 198.3 166.5 199.35 166.5 200.25C166.5 207.3 160.8 213 153.75 213H33.3C32.4 213 31.65 213 30.75 212.7H14.25C7.2 212.7 1.5 218.4 1.5 225.45C1.5 232.5 7.2 238.2 14.25 238.2H184.2L195.9 171.75H206.1L230.85 238.2H279.15L250.95 168C279.6 160.05 295.5 139.05 299.25 117.15C304.95 86.7 287.7 61.95 244.5 61.95ZM255.3 119.1C252.75 132.75 243.9 141.3 227.7 141.3H201L208.65 97.1999H235.35C251.85 97.1999 257.85 105.75 255.3 119.1Z" fill="#203F60" fill-opacity="0.95"/>
</g>
<defs>
<clipPath id="clip0_10342_2">
<rect width="300" height="300" fill="white"/>
</clipPath>
</defs>
</svg>

2 changes: 1 addition & 1 deletion resources/views/components/newsletter/partials/checkbox.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
if (typeof mutate === 'function' && (!{{ (int)$isPartOfAnotherForm }})) { mutate() }
if ($root.loggedIn) { $root.user.extension_attributes.is_subscribed={{ $attributes->get('v-model') }} }
}">
<x-slot:slot class="ml-2 flex flex-col gap-1">
<x-slot:slot class="flex flex-col gap-1">
<span class="text-ct-primary text-sm font-medium">@lang('Yes, I want to subscribe to the newsletter')</span>
<span class="text-ct-inactive text-xs font-normal">@lang('You will receive this newsletter approximately 2x a year')</span>
<x-rapidez-ct::newsletter-visual />
Expand Down