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

Ticket 573

Browse source 
page engagement : reduction espace + ancre nav
This commit is contained in:
Alexis Gousseau 2022-01-26 11:37:29 +01:00 • committed by Jérémy Munsch
parent 2021241c27
commit 3c97e117a4
No known key found for this signature in database
GPG key ID: 55196BEE445F6049
10 changed files with 475 additions and 278 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
database/migrations/2021_06_29_124751_create_engagements_table.php
View file

@ -37,7 +37,7 @@ class CreateEngagementsTable extends Migration
$table->timestamps();
});
$engagement0 = new Engagement([
'title' => 'Le Gaulois,<br> marque engagée et responsable',
'title' => 'Le Gaulois, marque engagée et responsable',
'content' => '<p>Face aux enjeux de notre époque, Le Gaulois répond présent.<br>Chaque jour, nous avançons pas à pas avec les équipes, les partenaires et les consommateurs pour élaborer des produits gourmands, de qualité et ainsi créer de bons moments de convivialité à table et en cuisine. Découvrez nos 5 engagements et nos actions pour minimiser l’impact de notre activité sur l’environnement, veiller au bien-être animal et améliorer notre alimentation et notre qualité de vie</p>',
'status' => true
]);

689
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -21,7 +21,7 @@
"del-cli": "^3.0.1",
"fslightbox": "^3.3.0",
"jquery": "^3.6.0",
"laravel-mix": "^6.0.31",
"laravel-mix": "^6.0.41",
"laravel-mix-polyfill": "^3.0.1",
"lodash": "^4.17.21",
"popper.js": "^1.16.1",

13
resources/sass/front/pages/onsengage/bloc1.scss vendored
View file

@ -36,24 +36,23 @@
color: $engagementDarkGreen;
}
& > .text {
padding-top: 1.6rem;
padding-bottom: 4.266rem;
padding-top: 1rem;
padding-bottom: 1rem;
font-family: 'Catamaran-Regular';
}
& > .link {
padding-top: 1.6rem;
padding-bottom: 4.266rem;
padding-top: 0rem;
padding-bottom: 0rem;
position: relative;
& > a {
display: inline-block;
}
&::after {
position: absolute;
bottom: 0;
content: " ";
display: block;
height: 0.2rem;
width: 4.266rem;
margin-top: 2rem;
background-color: $engagementLightGreen;
}
&.noborder::after {
@ -61,7 +60,7 @@
}
}
& > .labels {
padding-top: 4.266rem;
padding-top: 2rem;
display: flex;
flex-direction: row;
justify-content: space-between;

3
resources/sass/front/pages/onsengage/bloc2.scss vendored
View file

@ -43,7 +43,8 @@
}
}
& > .link {
margin-top: 1.6rem;
margin-top: 0rem;
padding-top: 1rem;
}
}
}

13
resources/sass/front/pages/onsengage/bloc3.scss vendored
View file

@ -27,17 +27,16 @@
color: $engagementDarkGreen;
}
& > .text {
padding-top: 1.6rem;
padding-bottom: 4.266rem;
padding-top: 1rem;
padding-bottom: 1rem;
font-family: 'Catamaran-Regular';
}
& > .link {
padding-top: 1.6rem;
padding-bottom: 4.266rem;
padding-top: 0rem;
padding-bottom: 0rem;
position: relative;
&::after {
position: absolute;
bottom: 0;
margin-top: 2rem;
content: " ";
display: block;
height: 0.2rem;
@ -49,7 +48,7 @@
}
}
& > .labels {
padding-top: 4.266rem;
padding-top: 0rem;
display: flex;
flex-direction: row;
justify-content: space-between;

6
resources/sass/front/pages/onsengage/bloc4.scss vendored
View file

@ -33,12 +33,12 @@
color: $engagementDarkGreen;
}
& > .text {
padding-bottom: 0.266rem;
padding-top: 1.6rem;
padding-bottom: 0rem;
padding-top: 1rem;
font-family: 'Catamaran-Regular';
}
& > .link {
padding-top: 1.6rem;
padding-top: 1rem;
position: relative;
&::after {
position: absolute;

9
resources/sass/front/pages/onsengage/common.scss vendored
View file

@ -1,6 +1,6 @@
.content.onsengage {
padding-top: 6rem;
padding-bottom: 6.467rem;
padding-bottom: 2rem;
h1,h2,h3,h4,h5,h6,p,ul,ol,span {
color: $color0;
@ -107,15 +107,16 @@
font-family: 'Veneer';
color: $engagementDarkGreen;
display: block;
padding: 0 1rem;
@include max-width($tablet) {
font-size: 3rem;
}
}
& > p {
font-family: 'Catamaran-Regular';
max-width: 52.9rem;
width: 100%;
font-size: 1.4rem;
margin: 2.67rem 1rem 3.734rem 1rem;
margin-top: 2rem;
}
}
@ -163,7 +164,7 @@
font-size: 1.2rem;
& > div:nth-child(n+3) {
margin-top: 6.4rem;
margin-top: 2rem;
}
// engagement 3 specific rules

4
resources/sass/front/pages/onsengage/nav.scss vendored
View file

@ -2,7 +2,9 @@
.nav-onsengage {
position: relative;
top: inherit;
margin: 0;
padding-top: 2rem;
scroll-margin-top: 5rem;
ul > li {
background-color: #FFFFFF;
margin-right: 1px ;

12
resources/views/front/onsengage/engageetresponsable/submenu.blade.php
View file

@ -1,9 +1,9 @@
<div class="super-nav nav-onsengage">
<div class="super-nav nav-onsengage" id="nav-on-s-engage">
<ul>
<li @if(request()->route()->getName() === 'onsengage.marqueengage.lagrandemarque')class="active" @endif><a href="{{ route('onsengage.marqueengage.lagrandemarque') }}">{{ __('100% Française') }}</a></li>
<li @if(request()->route()->getName() === 'onsengage.marqueengage.eleverdurablement')class="active" @endif><a href="{{ route('onsengage.marqueengage.eleverdurablement') }}">{{ __('Élever durablement') }}</a></li>
<li @if(request()->route()->getName() === 'onsengage.marqueengage.biennourrir')class="active" @endif><a href="{{ route('onsengage.marqueengage.biennourrir') }}">{{ __('Bien nourrir') }}</a></li>
<li @if(request()->route()->getName() === 'onsengage.marqueengage.vivreensemble')class="active" @endif><a href="{{ route('onsengage.marqueengage.vivreensemble') }}">{{ __('Mieux vivre ensemble') }}</a></li>
<li @if(request()->route()->getName() === 'onsengage.marqueengage.respecterlaterre')class="active" @endif><a href="{{ route('onsengage.marqueengage.respecterlaterre') }}">{{ __('Respecter la terre') }}</a></li>
<li @if(request()->route()->getName() === 'onsengage.marqueengage.lagrandemarque')class="active" @endif><a href="{{ route('onsengage.marqueengage.lagrandemarque') }}#nav-on-s-engage">{{ __('100% Française') }}</a></li>
<li @if(request()->route()->getName() === 'onsengage.marqueengage.eleverdurablement')class="active" @endif><a href="{{ route('onsengage.marqueengage.eleverdurablement') }}#nav-on-s-engage">{{ __('Élever durablement') }}</a></li>
<li @if(request()->route()->getName() === 'onsengage.marqueengage.biennourrir')class="active" @endif><a href="{{ route('onsengage.marqueengage.biennourrir') }}#nav-on-s-engage">{{ __('Bien nourrir') }}</a></li>
<li @if(request()->route()->getName() === 'onsengage.marqueengage.vivreensemble')class="active" @endif><a href="{{ route('onsengage.marqueengage.vivreensemble') }}#nav-on-s-engage">{{ __('Mieux vivre ensemble') }}</a></li>
<li @if(request()->route()->getName() === 'onsengage.marqueengage.respecterlaterre')class="active" @endif><a href="{{ route('onsengage.marqueengage.respecterlaterre') }}#nav-on-s-engage">{{ __('Respecter la terre') }}</a></li>
</ul>
</div>