Merge branch '20-ts-1275' into 'develop'

Resolve "ts-1275"

See merge request ldc-web/projets/boutique-cnc-sable!36
This commit is contained in:
Vincent BRIDIER 2023-07-21 14:23:10 +00:00
commit 253433c7f7
9 changed files with 38 additions and 15 deletions

View file

@ -6,12 +6,12 @@
@section('breadcrumb', 'no')
@section('content')
<section class="auth-login d-flex flex-column justify-content-center">
<section class="contact-content">
<h1 class="title-medium font-Barlow-extra-bold text-uppercase text-grey text-center">{!! $content->title !!}</h1>
<div class="row justify-content-around">
<div class="col-12 col-lg-6 p-0 font-Barlow-bold">
@if ($content !== null)
{!! $content->value !!}
{!! clean($content->value) !!}
@else
<p>{{ __('Bonjour,') }}</p>
<p>{{ __('Si vous avez une question à nous poser ou des remarques à formuler sur notre site, n\'hésitez pas à les inscrire dans le formulaire ci-contre. Merci d\'indiquer vos coordonnées exactes pour que nous puissions vous répondre prochainement.') }}</p>

View file

@ -6,7 +6,7 @@
@section('breadcrumb', 'no')
@section('content')
<section class="auth-login d-flex justify-content-center align-items-start">
<section>
<div class="row w-100">
<div class="col">
<h1 class="title-medium font-Barlow-extra-bold text-uppercase text-grey text-center">{{ $content->value }}</h1>

View file

@ -29,7 +29,7 @@
<meta name="csrf-token" content="{{ csrf_token() }}">
<!-- Styles -->
<link href="{{ asset(config('app.theme') . '/css/app.css') }}" rel="stylesheet">
<link href="{{ mix(config('app.theme') . '/css/app.css') }}" rel="stylesheet">
@if(config('app.env') === 'local')
<script>window.vueDebug = true;</script>

View file

@ -15,7 +15,7 @@
@include('layouts.footer')
</div>
<script src="{{ asset(config('app.theme') . '/js/app.js') }}"></script>
<script src="{{ mix(config('app.theme') . '/js/app.js') }}"></script>
@yield('scripts')
@include('partials.cookie')

View file

@ -6,14 +6,14 @@
@section('breadcrumb', 'no')
@section('content')
<section class="auth-login d-flex justify-content-center align-items-center">
<section>
<div class="row">
<div class="col">
<h1 class="title-medium font-Barlow-extra-bold text-uppercase text-grey text-center">{{ $content->title }}</h1>
@if ($content !== null)
<div class="row mt-2">
<div class="col d-flex flex-column justify-content-center align-items-center text-center">
{!! $content->value !!}
<div class="col d-flex flex-column justify-content-center">
{!! clean($content->value) !!}
</div>
</div>
@endif

View file

@ -6,14 +6,14 @@
@section('breadcrumb', 'no')
@section('content')
<section class="auth-login d-flex justify-content-center align-items-center">
<section>
<div class="row">
<div class="col">
<h1 class="title-medium font-Barlow-extra-bold text-uppercase text-grey text-center">{{ $content->title }}</h1>
@if ($content !== null)
<div class="row mt-2">
<div class="col d-flex flex-column justify-content-center align-items-center text-center">
{!! $content->value !!}
<div class="col d-flex flex-column justify-content-center">
{!! clean($content->value) !!}
</div>
</div>
@endif

View file

@ -180,6 +180,27 @@ img {
}
}
.contact {
&-content {
form {
width: 100%;
max-width: 25rem;
.form-control {
width: 20rem;
}
img {
height: 5rem;
}
textarea {
resize: none;
}
}
}
}
.pagination {
.page-link {
background-color: #f6c500;

View file

@ -6,14 +6,14 @@
@section('breadcrumb', 'no')
@section('content')
<section class="auth-login d-flex justify-content-center align-items-center">
<section>
<div class="row">
<div class="col">
<h1 class="title-medium font-Barlow-extra-bold text-uppercase text-grey text-center">{{ $content->title }}</h1>
@if ($content !== null)
<div class="row mt-2">
<div class="col d-flex flex-column justify-content-center align-items-center text-center">
{!! $content->value !!}
<div class="col d-flex flex-column justify-content-center overflow-hidden">
{!! clean($content->value) !!}
</div>
</div>
@endif

4
webpack.mix.js vendored
View file

@ -32,7 +32,9 @@ mix.js('resources/views/front/' + process.env.APP_THEME + '/js/app.js', 'public/
.sass('resources/views/front/' + process.env.APP_THEME + '/sass/app.scss', 'public/' + process.env.APP_THEME + '/css')
.options({
processCssUrls: false
});
})
.version();
mix.copyDirectory('resources/views/front/' + process.env.APP_THEME + '/img', 'public/' + process.env.APP_THEME + '/img/')
.copyDirectory('resources/views/front/' + process.env.APP_THEME + '/fonts', 'public/' + process.env.APP_THEME + '/fonts/');