forge-joniko/ldc-agis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mulitple-issues' into 'develop'

Browse source 
Mulitple issues

See merge request ldc-web/projets/agis!28
This commit is contained in:
Vincent BRIDIER 2024-01-29 11:58:53 +00:00
commit fa7d44d03d
5 changed files with 310 additions and 279 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

576
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -28,7 +28,7 @@
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.36.2",
"@vitejs/plugin-basic-ssl": "^1.0.1",
"@vitejs/plugin-vue": "latest",
"@vitejs/plugin-vue": "^4.6.2",
"@vue/compiler-sfc": "latest",
"@vue/eslint-config-typescript": "latest",
"@vue/tsconfig": "^0.4.0",

2
resources/views/fo/layouts/nav-list.blade.php
View file

@ -8,7 +8,7 @@
href="{{ route('fo.explorer') }}" title="{{ __('L\'explorateur & Gastronome') }}">
{{ __('L\'explorateur & Gastronome') }}
</a>
<a class="nav-link display-5 fw-bold text-uppercase @if (request()->routeIs('fo.ranges.index')) active @endif" data-bs-toggle="tooltip"
<a class="nav-link display-5 fw-bold text-uppercase @if (request()->routeIs('fo.ranges.*') or request()->routeIs('fo.products.*')) active @endif" data-bs-toggle="tooltip"
href="{{ route('fo.ranges.index') }}" title="{{ __('Nos gammes') }}">
{{ __('Nos gammes') }}
</a>

2
resources/views/fo/pages/contact.blade.php
View file

@ -18,7 +18,7 @@
<p class="text-capitalize m-0 text-center">{{ __('siège social agis') }}</p>
<p class="text-capitalize m-0 text-center">{{ __('802 rue sainte-geneviève') }}</p>
<p class="text-capitalize m-0 text-center">{{ __('84000 avignon') }}</p>
<p class="text-capitalize m-0 text-center">{{ __('t. +33 (0)1 4 90 80 99') }}</p>
<p class="text-capitalize m-0 text-center">{{ __('T. +33 (0)4 90 80 99 99') }}</p>
</div>
</div>
</div>

7
resources/views/fo/pages/news/show.blade.php
View file

@ -32,8 +32,11 @@
alt="{{ Str::of($newsModel->picture_alt)->ucFirst() }}">
</div>
<div class="news-single-content mx-auto mt-3">
<p class="fs-7 fw-semibold text-center">{{ $newsModel->subtitle }}</p>
<br>
<div class="ps-md-2">
<span class="d-inline-block fs-4 fw-semibold highlight black text-light my-5 px-3 py-2">
{{ $newsModel->subtitle }}
</span>
</div>
<div class="ck-content">
{!! clean($newsModel->content) !!}
</div>