Merge branch 'issue-26' into 'develop'

fix title size - issue #26

See merge request ldc-web/projets/boutique-cnc-sable!45
This commit is contained in:
Vincent BRIDIER 2023-08-03 09:20:47 +00:00
commit 643efd25af
7 changed files with 73 additions and 70 deletions

17
package-lock.json generated
View file

@ -4,7 +4,6 @@
"requires": true,
"packages": {
"": {
"name": "srcs",
"devDependencies": {
"@fancyapps/fancybox": "^3.5.7",
"@fortawesome/fontawesome-free": "^6.2.0",
@ -3284,9 +3283,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001393",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001393.tgz",
"integrity": "sha512-N/od11RX+Gsk+1qY/jbPa0R6zJupEa0lxeBG598EbrtblxVCTJsQwbRBm6+V+rxpc5lHKdsXb9RY83cZIPLseA==",
"version": "1.0.30001517",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
"integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==",
"dev": true,
"funding": [
{
@ -3296,6 +3295,10 @@
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
},
{
"type": "github",
"url": "https://github.com/sponsors/ai"
}
]
},
@ -12340,9 +12343,9 @@
}
},
"caniuse-lite": {
"version": "1.0.30001393",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001393.tgz",
"integrity": "sha512-N/od11RX+Gsk+1qY/jbPa0R6zJupEa0lxeBG598EbrtblxVCTJsQwbRBm6+V+rxpc5lHKdsXb9RY83cZIPLseA==",
"version": "1.0.30001517",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
"integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==",
"dev": true
},
"chalk": {

View file

@ -7,7 +7,7 @@
@section('content')
<section class="contact-content">
<h1 class="title-medium font-Barlow-extra-bold text-uppercase text-grey text-center">{!! $content->title !!}</h1>
<h1 class="title-big title-sm-medium font-Barlow-extra-bold text-uppercase text-grey text-center mt-5">{!! $content->title !!}</h1>
<div class="row justify-content-around">
<div class="col-12 col-lg-6 p-0 font-Barlow-bold">
@if ($content !== null)

View file

@ -6,27 +6,27 @@
@section('breadcrumb', 'no')
@section('content')
<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>
@if ($content !== null)
@foreach ($faq as $key => $f)
<div class="row mt-2">
<div class="col">
<button class="btn btn-product title-small rounded-4 text-dark"
type="button" data-bs-toggle="collapse" data-bs-target="#faqNumber{{ $key }}" aria-expanded="false"
aria-controls="faqNumber{{ $key }}">
<div class="d-flex flex-row justify-content-center align-items-center">{{ $f->question }}</div>
</button>
<div id="faqNumber{{ $key }}" class="collapse">
<p class="m-0 p-3 pt-2">{{ $f->answer }}</p>
</div>
</div>
</div>
@endforeach
@endif
<section>
<div class="row w-100">
<div class="col">
<h1 class="title-big title-sm-medium font-Barlow-extra-bold text-uppercase text-grey text-center mt-5">{{ $content->value }}</h1>
@if ($content !== null)
@foreach ($faq as $key => $f)
<div class="row mt-2">
<div class="col">
<button class="btn btn-product title-small rounded-4 text-dark"
type="button" data-bs-toggle="collapse" data-bs-target="#faqNumber{{ $key }}" aria-expanded="false"
aria-controls="faqNumber{{ $key }}">
<div class="d-flex flex-row justify-content-center align-items-center">{{ $f->question }}</div>
</button>
<div id="faqNumber{{ $key }}" class="collapse">
<p class="m-0 p-3 pt-2">{{ $f->answer }}</p>
</div>
</div>
</div>
@endforeach
@endif
</div>
</section>
</div>
</section>
@endsection

View file

@ -6,18 +6,18 @@
@section('breadcrumb', 'no')
@section('content')
<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">
{!! clean($content->value) !!}
</div>
</div>
@endif
<section>
<div class="row">
<div class="col">
<h1 class="title-big title-sm-medium font-Barlow-extra-bold text-uppercase text-grey text-center mt-5">{{ $content->title }}</h1>
@if ($content !== null)
<div class="row mt-2">
<div class="col d-flex flex-column justify-content-center">
{!! clean($content->value) !!}
</div>
</div>
@endif
</div>
</section>
</div>
</section>
@endsection

View file

@ -6,18 +6,18 @@
@section('breadcrumb', 'no')
@section('content')
<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">
{!! clean($content->value) !!}
</div>
</div>
@endif
<section>
<div class="row">
<div class="col">
<h1 class="title-big title-sm-medium font-Barlow-extra-bold text-uppercase text-grey text-center mt-5">{{ $content->title }}</h1>
@if ($content !== null)
<div class="row mt-2">
<div class="col d-flex flex-column justify-content-center">
{!! clean($content->value) !!}
</div>
</div>
@endif
</div>
</section>
</div>
</section>
@endsection

View file

@ -156,7 +156,7 @@
font-size: 5em;
}
.title-medium {
.title-medium, .title-sm-medium {
font-size: 2em;
}
@ -185,7 +185,7 @@
font-size: 7em;
}
.title-medium {
.title-medium, .title-sm-medium {
font-size: 1.5em;
}
}
@ -210,7 +210,7 @@
font-size: 7em;
}
.title-medium {
.title-medium, .title-sm-medium {
font-size: 2em;
}
}
@ -231,7 +231,7 @@
// X:::::X X:::::XL::::::::::::::::::::::L
// XXXXXXX XXXXXXXLLLLLLLLLLLLLLLLLLLLLLLL
@include media-breakpoint-up(xl) { //1200px
.title-medium {
.title-medium, .title-sm-medium {
font-size: 3em;
}
@ -260,7 +260,7 @@
font-size: 10em;
}
.title-medium {
.title-medium, .title-sm-medium {
font-size: 4em;
}

View file

@ -6,18 +6,18 @@
@section('breadcrumb', 'no')
@section('content')
<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 overflow-hidden">
{!! clean($content->value) !!}
</div>
</div>
@endif
<section>
<div class="row">
<div class="col">
<h1 class="title-big title-sm-medium font-Barlow-extra-bold text-uppercase text-grey text-center mt-5">{{ $content->title }}</h1>
@if ($content !== null)
<div class="row mt-2">
<div class="col d-flex flex-column justify-content-center overflow-hidden">
{!! clean($content->value) !!}
</div>
</div>
@endif
</div>
</section>
</div>
</section>
@endsection