Merge branch 'ticket722' into develop
This commit is contained in:
Olivier Legat
commit
49cbebc1fb
5 changed files with 42 additions and 85 deletions
BIN
resources/assets/images/marque/fond-bois.png
Normal file
BIN
resources/assets/images/marque/fond-bois.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8 MiB |
117
resources/sass/front/_sub_header.scss
vendored
117
resources/sass/front/_sub_header.scss
vendored
|
|
@ -192,10 +192,10 @@
|
|||
background-repeat: no-repeat;
|
||||
background-position: center 101%;
|
||||
background-size: 101% auto;
|
||||
height: 100%;
|
||||
height: 345px;
|
||||
width: 100%;
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
bottom: -5%;
|
||||
z-index: 10;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
|
@ -312,6 +312,7 @@
|
|||
.sub_header_club_index {
|
||||
margin-top: $menuBaseHeight;
|
||||
}
|
||||
|
||||
.sub_header_club {
|
||||
margin-top: $menuBaseHeight;
|
||||
padding-bottom: 1rem;
|
||||
|
|
@ -980,29 +981,25 @@
|
|||
}
|
||||
|
||||
.sub_header_onsengage {
|
||||
background-image: url("~@/images/onsengage/onsengage_banner.jpg");
|
||||
width: 100%;
|
||||
height: 44em;
|
||||
margin-top: 5rem;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
background-position: center center;
|
||||
height: 50vw;
|
||||
max-height: 26.33rem;
|
||||
min-height: 21rem;
|
||||
overflow: visible;
|
||||
|
||||
&:after {
|
||||
content: "";
|
||||
background-image: inherit;
|
||||
background-repeat: no-repeat;
|
||||
height: inherit;
|
||||
width: inherit;
|
||||
position: inherit;
|
||||
}
|
||||
background-image: url("~@/images/onsengage/onsengage_banner.jpg");
|
||||
|
||||
& .logo {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 0;
|
||||
transform: translateX(-50%);
|
||||
margin: 8rem 0 0;
|
||||
margin: 4rem 0 0;
|
||||
font-size: 1.2em;
|
||||
z-index: 11;
|
||||
}
|
||||
|
||||
// @include max-width($tablet + 60px) {
|
||||
|
|
@ -1017,11 +1014,15 @@
|
|||
}
|
||||
|
||||
.sub_header_joinus {
|
||||
background-image: url("~@/images/joinus/nr_banner.jpg");
|
||||
width: 100%;
|
||||
height: 44em;
|
||||
margin-top: 5rem;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
background-position: center center;
|
||||
height: 50vw;
|
||||
max-height: 26.33rem;
|
||||
min-height: 21rem;
|
||||
background-image: url("~@/images/joinus/nr_banner.jpg");
|
||||
|
||||
& .title {
|
||||
position: absolute;
|
||||
|
|
@ -1401,6 +1402,7 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.sub_header_recipe {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
|
|
@ -1645,6 +1647,7 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Override breadcrumb position for recipes show
|
||||
#app.recipeShow {
|
||||
left: inherit !important;
|
||||
|
|
@ -1676,16 +1679,19 @@
|
|||
|
||||
.sub_header_ocb {
|
||||
width: 100%;
|
||||
height: 370px;
|
||||
margin-top: 70px;
|
||||
overflow: hidden;
|
||||
margin-top: 5rem;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
background-position: center top;
|
||||
height: 50vw;
|
||||
max-height: 26.33rem;
|
||||
min-height: 21rem;
|
||||
position: relative;
|
||||
background-image: url("~@/images/ocb/oui-header.jpg");
|
||||
|
||||
& .content {
|
||||
position: relative;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
& .text {
|
||||
position: absolute;
|
||||
|
|
@ -1704,7 +1710,6 @@
|
|||
position: relative;
|
||||
text-decoration: none;
|
||||
line-height: 1em;
|
||||
margin-top: 3rem;
|
||||
font-size: 6.9em;
|
||||
font-family: "Veneer";
|
||||
color: white;
|
||||
|
|
@ -1805,20 +1810,6 @@
|
|||
z-index: 9;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
& .entete-ocb {
|
||||
content: "";
|
||||
background-image: url("~@/images/ocb/entete-oui.svg");
|
||||
background-repeat: no-repeat;
|
||||
background-position: center 101%;
|
||||
background-size: 160rem 13rem;
|
||||
height: 31rem;
|
||||
top: 4rem;
|
||||
width: 100%;
|
||||
position: absolute;
|
||||
z-index: 11;
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
.sub_header_saga {
|
||||
|
|
@ -1886,31 +1877,19 @@
|
|||
|
||||
.sub_header_brand {
|
||||
width: 100%;
|
||||
height: 290px;
|
||||
margin-top: 70px;
|
||||
overflow: hidden;
|
||||
margin-top: 5rem;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
background-position: center center;
|
||||
background-image: url("~@/images/marque/marque_background.jpg");
|
||||
height: 50vw;
|
||||
max-height: 26.33rem;
|
||||
min-height: 21rem;
|
||||
background-image: url("~@/images/marque/fond-bois.png");
|
||||
|
||||
.content-brand {
|
||||
background-image: url("~@/images/commun/entete.svg");
|
||||
background-repeat: no-repeat;
|
||||
background-position: center 150%;
|
||||
background-size: 101% auto;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
@include max-width($large_screen) {
|
||||
background-position: center 88%;
|
||||
}
|
||||
@include max-width($desktop) {
|
||||
background-position: center 84%;
|
||||
}
|
||||
@include max-width($tablet) {
|
||||
background-image: none;
|
||||
}
|
||||
|
||||
h1 {
|
||||
color: white;
|
||||
text-align: center;
|
||||
|
|
@ -1923,22 +1902,12 @@
|
|||
margin-top: 5rem;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
background-size: auto;
|
||||
background-size: cover;
|
||||
height: 50vw;
|
||||
max-height: 29.33rem;
|
||||
max-height: 26.33rem;
|
||||
min-height: 21rem;
|
||||
background-image: url("~@/images/marque/marque_background.jpg");
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
background-image: none;
|
||||
z-index: 0;
|
||||
background-repeat: no-repeat;
|
||||
background-position: initial;
|
||||
background-size: contain;
|
||||
position: inherit;
|
||||
}
|
||||
|
||||
.content-actu {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
|
@ -1967,16 +1936,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
@include max-width($large_screen) {
|
||||
background-position: center 88%;
|
||||
}
|
||||
@include max-width($desktop) {
|
||||
background-position: center 84%;
|
||||
}
|
||||
@include max-width($tablet) {
|
||||
background-image: none;
|
||||
}
|
||||
|
||||
h1 {
|
||||
color: white;
|
||||
text-align: center;
|
||||
|
|
|
|||
5
resources/sass/front/pages/brand/index.scss
vendored
5
resources/sass/front/pages/brand/index.scss
vendored
|
|
@ -7,13 +7,12 @@
|
|||
strong {
|
||||
font-weight: bold;
|
||||
}
|
||||
font-size: 1.5em;
|
||||
font-size: 1.4rem;
|
||||
font-family: "Catamaran-Regular";
|
||||
line-height: 125%;
|
||||
}
|
||||
h3 {
|
||||
margin: 20px;
|
||||
font-size: 3.2em;
|
||||
font-size: 4rem;
|
||||
color: $color5;
|
||||
font-family: "Veneer";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,9 +5,7 @@
|
|||
|
||||
@section('sub_header')
|
||||
<div class="sub_header sub_header_brand">
|
||||
<div class="content-brand">
|
||||
<h1 class="title">{{ __('La Marque') }}</h1>
|
||||
</div>
|
||||
<div class="content-brand"></div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
|
|
|
|||
|
|
@ -119,6 +119,7 @@ Breadcrumbs::for('kitchen-side.health-nutrition.nutrition-quality', function (Ge
|
|||
Breadcrumbs::for('brand.index', function (Generator $trail) {
|
||||
$trail->parent('home');
|
||||
$trail->push(__('La marque'), route('brand.index'));
|
||||
$trail->push(__('Le Gaulois, Français et Populaire'), route('brand.index'));
|
||||
});
|
||||
Breadcrumbs::for('brand.history', function (Generator $trail) {
|
||||
$trail->parent('brand.index');
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue