Merge branch 'ticket1032' into develop
This commit is contained in:
Vincent BRIDIER
commit
cf2a9f2a67
9 changed files with 1118 additions and 565 deletions
|
|
@ -78,20 +78,6 @@ class OCBController extends Controller
|
|||
return view('front.ocb.poultry', compact('breeder', 'ocbContents'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Show ocb rabbit content
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
|
||||
*/
|
||||
public function rabbit()
|
||||
{
|
||||
$ocbContents = OCBContent::where('type', OCBType::rabbit())
|
||||
->where('status', true)
|
||||
->orderBy('order')
|
||||
->get();
|
||||
return view('front.ocb.rabbit', compact('ocbContents'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Show ocb egg content
|
||||
*
|
||||
|
|
|
|||
1567
package-lock.json
generated
1567
package-lock.json
generated
File diff suppressed because it is too large
Load diff
Binary file not shown.
|
Before Width: | Height: | Size: 347 KiB |
49
resources/sass/front/pages/ocb/_index.scss
vendored
49
resources/sass/front/pages/ocb/_index.scss
vendored
|
|
@ -14,7 +14,7 @@
|
|||
align-items: center;
|
||||
z-index: 12;
|
||||
|
||||
@media screen and (max-width: ($large_screen - 100)) {
|
||||
@media screen and (max-width: $large_screen - 100) {
|
||||
flex-direction: column;
|
||||
height: auto;
|
||||
padding: 10px 0;
|
||||
|
|
@ -23,61 +23,62 @@
|
|||
& > div {
|
||||
position: relative;
|
||||
|
||||
& img {
|
||||
width: 100%;
|
||||
padding: 15px 15px;
|
||||
filter: brightness(0.8);
|
||||
@media screen and (max-width: ($large_screen - 100)) {
|
||||
transform: inherit !important;
|
||||
}
|
||||
}
|
||||
|
||||
&:hover img {
|
||||
filter: brightness(1);
|
||||
}
|
||||
|
||||
& .left {
|
||||
transform: skew(-2deg, -1deg);
|
||||
filter: brightness(0.8);
|
||||
|
||||
@media screen and (max-width: $large_screen) {
|
||||
width: 100%;
|
||||
padding: 15px 15px;
|
||||
}
|
||||
}
|
||||
|
||||
& .right {
|
||||
transform: skew(1deg, 1deg);
|
||||
filter: brightness(0.8);
|
||||
|
||||
@media screen and (max-width: $large_screen) {
|
||||
width: 100%;
|
||||
padding: 15px 15px;
|
||||
}
|
||||
}
|
||||
|
||||
& > p {
|
||||
z-index: 1;
|
||||
position: absolute;
|
||||
bottom: 4.4rem;
|
||||
left: 1.5rem;
|
||||
bottom: 55px;
|
||||
left: 15px;
|
||||
color: white;
|
||||
font-family: "Catamaran-Black";
|
||||
text-transform: uppercase;
|
||||
font-size: 40px;
|
||||
line-height: 38px;
|
||||
text-shadow: 1px 1px 15px black;
|
||||
@media screen and (max-width: ($large_screen - 100)) {
|
||||
@media screen and (max-width: $desktop) {
|
||||
left: 20%;
|
||||
transform: translateX(-50%);
|
||||
left: 9rem;
|
||||
bottom: 5.5rem;
|
||||
bottom: 6rem;
|
||||
}
|
||||
@media screen and (max-width: $tablet) {
|
||||
font-size: 2rem;
|
||||
line-height: 2rem;
|
||||
left: 20vw;
|
||||
left: 30%;
|
||||
}
|
||||
@media screen and (max-width: $mobile) {
|
||||
font-size: 1.5rem;
|
||||
line-height: 1.5rem;
|
||||
left: 25vw;
|
||||
}
|
||||
}
|
||||
|
||||
& > a {
|
||||
z-index: 1;
|
||||
position: absolute;
|
||||
bottom: 1.6rem;
|
||||
left: 1.5rem;
|
||||
bottom: 15px;
|
||||
left: 15px;
|
||||
background-color: #003b22;
|
||||
color: white;
|
||||
padding: 5px 20px 4px 20px;
|
||||
|
|
@ -93,18 +94,18 @@
|
|||
color: #003b22;
|
||||
}
|
||||
|
||||
@media screen and (max-width: ($large_screen - 100)) {
|
||||
@media screen and (max-width: $desktop) {
|
||||
left: 20%;
|
||||
transform: translateX(-50%);
|
||||
left: 7rem;
|
||||
bottom: 2.5rem;
|
||||
bottom: 3rem;
|
||||
}
|
||||
@media screen and (max-width: $tablet) {
|
||||
font-size: 1rem;
|
||||
left: 20vw;
|
||||
left: 30%;
|
||||
}
|
||||
@media screen and (max-width: $mobile) {
|
||||
font-size: 0.7rem;
|
||||
left: 25vw;
|
||||
left: 30%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
'ocbContents' => $ocbContents
|
||||
])
|
||||
<section class="poultry-infos space">
|
||||
<a href="{{ route('ocb.rabbit') }}" class="previous">
|
||||
<a href="{{ route('ocb.poultry') }}" class="previous">
|
||||
<span></span>
|
||||
<p class="button-text">{{ __('Découvrer le lapin Oui C\'est Bon!') }}</p>
|
||||
<p class="button-text">{{ __('Découvrer la volaille Oui C\'est Bon!') }}</p>
|
||||
</a>
|
||||
</section>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -20,17 +20,12 @@
|
|||
<section class="ocb-bg content content-ocb">
|
||||
<div class="items">
|
||||
<div>
|
||||
<img src="{{ asset('assets/images/ocb/mockocb.png') }}" alt="Poulet & Dinde - Le Gaulois" class="left">
|
||||
<img src="{{ asset('assets/images/ocb/ocb_poule_x2.png') }}" alt="Poulet & Dinde - Le Gaulois" class="left">
|
||||
<p>Poulets<br>& Dindes</p>
|
||||
<a href="{{ route('ocb.poultry') }}">En savoir +</a>
|
||||
</div>
|
||||
<div>
|
||||
<img src="{{ asset('assets/images/ocb/mockocb.png') }}" alt="Lapin - Le Gaulois" class="left">
|
||||
<p>Lapins</p>
|
||||
<a href="{{ route('ocb.rabbit') }}">En savoir +</a>
|
||||
</div>
|
||||
<div>
|
||||
<img src="{{ asset('assets/images/ocb/mockocb.png') }}" alt="Oeuf - Le Gaulois" class="right">
|
||||
<img src="{{ asset('assets/images/ocb/ocb_oeuf_x2.png') }}" alt="Oeuf - Le Gaulois" class="right">
|
||||
<p>Oeufs</p>
|
||||
<a href="{{ route('ocb.egg') }}">En savoir +</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
'ocbContents' => $ocbContents
|
||||
])
|
||||
<section class="poultry-infos">
|
||||
<a href="{{ route('ocb.rabbit') }}" class="next">
|
||||
<a href="{{ route('ocb.egg') }}" class="next">
|
||||
<span></span>
|
||||
<p class="button-text">{{ __('Découvrez le lapin Oui C\'est Bon!') }}</p>
|
||||
<p class="button-text">{{ __('Découvrez les oeufs Oui C\'est Bon!') }}</p>
|
||||
</a>
|
||||
<div class="breeder-info">
|
||||
@if ($breeder !== null && $breeder->picture !== null)
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
@extends('layouts.app')
|
||||
@section('title', __('Tout savoir sur la gamme Oui c\'est Bon! - Lapin'))
|
||||
@section('description', __('Le Gaulois, marque de lapins nés, élevées et préparés en France vous raconte son histoire.'))
|
||||
|
||||
@section('sub_header')
|
||||
<div class="sub_header sub_header_ocb">
|
||||
<div class="content">
|
||||
<div class="text">
|
||||
<h1 class="title">{{ __('Le lapin') }} <img class="img-ocb" src="{{ asset('assets/images/ocb/logo-oui.png') }}" alt="{{ __('Oui c\'est Bon ! - Le Gaulois') }}"></h1>
|
||||
</div>
|
||||
</div>
|
||||
<div class="entete-ocb"></div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
|
||||
<div class="ocb-content">
|
||||
@include('front.ocb.ocbContent' , [
|
||||
'ocbContents' => $ocbContents
|
||||
])
|
||||
<section class="poultry-infos space">
|
||||
<a href="{{ route('ocb.poultry') }}" class="previous">
|
||||
<span></span>
|
||||
<p class="button-text">{{ __('Découvrer la volaille Oui C\'est Bon!') }}</p>
|
||||
</a>
|
||||
<a href="{{ route('ocb.egg') }}" class="next">
|
||||
<span></span>
|
||||
<p class="button-text">{{ __('Découvrer les oeufs Oui C\'est Bon!') }}</p>
|
||||
</a>
|
||||
</section>
|
||||
</div>
|
||||
<!-- TODO : Maps -->
|
||||
@endsection
|
||||
|
|
@ -156,7 +156,7 @@ Route::prefix('/oui-cest-bon')
|
|||
Route::get('/eleveurs/{breeder}', [OCBController::class, 'breeder'])->name('breeders');
|
||||
Route::get('/temoignages-eleveurs', [OCBController::class, 'testimonials'])->name('testimonials');
|
||||
Route::get('/volaille', [OCBController::class, 'poultry'])->name('poultry');
|
||||
Route::get('/lapin', [OCBController::class, 'rabbit'])->name('rabbit');
|
||||
Route::get('/volaille', [OCBController::class, 'poultry'])->name('poultry');
|
||||
Route::get('/oeuf', [OCBController::class, 'egg'])->name('egg');
|
||||
Route::view('/', 'front.ocb.index')->name('index');
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue