Skip to content

Commit f2ed6c6

Browse files
authored
Merge pull request #21 from codebar-ag/main
main/production
2 parents 1d47c03 + be5eebb commit f2ed6c6

File tree

6 files changed

+28
-36
lines changed

6 files changed

+28
-36
lines changed

database/seeders/Paperflakes/ContactsTableSeeder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public function run(): void
182182
],
183183
],
184184
'icons' => [
185-
'email' => 'info@codebar.ch',
185+
'email' => 'wieland@business-solutions.gmbh',
186186
'website' => 'https://www.business-solutions.gmbh',
187187
],
188188
'image' => 'https://res.cloudinary.com/codebar/image/upload/w_400,h_400,f_auto,q_auto/www-paperflakes-ch/people/wds.jpg',

resources/views/app/about-us/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<x-list-image-card
6969
:name="$contact->name"
7070
:image="$contact->image"
71-
image-container-class-attributes="h-20 w-20 flex-shrink-0 overflow-hidden"/>
71+
image-container-class-attributes="h-24 w-24 flex-shrink-0 overflow-hidden"/>
7272
@endforeach
7373
</x-list-grid>
7474
</x-section>

resources/views/components/list-image-card.blade.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
@props([
22
'image',
3-
'imageContainerClassAttributes' => 'h-30 h-30 flex-shrink-0 overflow-hidden',
3+
'imageContainerClassAttributes' => 'h-32 h-32 flex-shrink-0 overflow-hidden',
44
'name',
55
'role' => null,
66
'icons' => [],
77
])
88

9-
<div class="flex rounded-xl overflow-hidden transition
10-
group">
9+
<div class="flex flex-row rounded-xl overflow-hidden transition group">
1110
<div class="{{ $imageContainerClassAttributes }}">
1211
<img src="{{ $image }}" alt="{{ $name }}"
1312
class="w-full h-full object-cover transition-transform duration-300 ease-in-out group-hover:scale-105"/>
Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,46 @@
11
<nav class="mt-12 text-xl md:text-2xl" x-data="navigation">
2-
3-
<div class="flex justify-center md:justify-start">
2+
{{-- Logo & Language Switcher --}}
3+
<div class="flex justify-between items-center">
44
<a href="{{ localized_route('start.index') }}" title="Start page" class="group inline-block">
55
<x-logo-paperflakes/>
66
</a>
7+
8+
@if(!empty($locales))
9+
<div class="hidden lg:flex gap-2 text-lg items-center">
10+
@foreach($locales as $language)
11+
<form method="POST" action="{{ route('language.update') }}">
12+
@csrf
13+
<input type="hidden" name="language" value="{{ $language->value }}">
14+
<button type="submit" class="hover:text-black hover:font-semibold transition cursor-pointer"
15+
title="{{ __('Update to :lang language', ['lang' => $language->getLabel()]) }}">
16+
{{ $language->getLabel() }}
17+
</button>
18+
</form>
19+
@if (!$loop->last)
20+
<span class="text-gray-400 font-light">|</span>
21+
@endif
22+
@endforeach
23+
</div>
24+
@endif
725
</div>
826

27+
{{-- Navigation & mobile toggle --}}
928
<div class="mt-2 flex items-center justify-between">
10-
1129
@include('layouts._partials._navigation_desktop')
1230

1331
<button @click="toggle"
14-
class="flex items-center gap-1 md:hidden hover:text-black hover:font-semibold transition focus:outline-none mx-auto">
32+
class="flex items-center gap-1 lg:hidden hover:text-black hover:font-semibold transition focus:outline-none mx-auto">
1533
<span>{{ __('Menu') }}</span>
1634

1735
<div class="transition-transform duration-300 ease-in-out" x-bind:class="icon_rotate">
18-
1936
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-6">
2037
<path fill-rule="evenodd"
2138
d="M12.53 16.28a.75.75 0 0 1-1.06 0l-7.5-7.5a.75.75 0 0 1 1.06-1.06L12 14.69l6.97-6.97a.75.75 0 1 1 1.06 1.06l-7.5 7.5Z"
2239
clip-rule="evenodd"/>
2340
</svg>
2441
</div>
2542
</button>
26-
2743
</div>
2844

2945
@include('layouts._partials._navigation_mobile')
30-
3146
</nav>
Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@php use App\Enums\LocaleEnum; @endphp
22

3-
<div class="hidden md:flex justify-between w-full">
4-
5-
{{-- Left-aligned primary navigation --}}
3+
<div class="hidden lg:flex justify-between w-full">
64
<div class="flex gap-2">
75

86
<x-a :href="localized_route('start.index')" label="{{ __('News') }}"
@@ -29,24 +27,4 @@ classAttributes="text-xl md:text-2xl"/>
2927
classAttributes="text-xl md:text-2xl"/>
3028

3129
</div>
32-
33-
<!-- Language -->
34-
@if(!empty($locales))
35-
<div class="flex gap-2 text-lg items-center">
36-
@foreach($locales as $language)
37-
<form method="POST" action="{{ route('language.update') }}">
38-
@csrf
39-
<input type="hidden" name="language" value="{{ $language->value }}">
40-
<button type="submit" class="hover:text-black hover:font-semibold transition cursor-pointer"
41-
title="{{ __('Update to :lang language', ['lang' => $language->getLabel()]) }}">
42-
{{ $language->getLabel() }}
43-
</button>
44-
</form>
45-
@if (!$loop->last)
46-
<span class="text-gray-400 font-light">|</span>
47-
@endif
48-
@endforeach
49-
</div>
50-
@endif
51-
5230
</div>

resources/views/layouts/_partials/_navigation_mobile.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@php use App\Enums\LocaleEnum; @endphp
22

33
<div x-show="open" x-transition x-cloak
4-
class="md:hidden mt-4 text-xl space-y-2">
4+
class="lg:hidden mt-4 text-xl space-y-2">
55
<!-- News -->
66
<a @click.stop
77
href="{{ localized_route('start.index') }}"

0 commit comments

Comments
 (0)