diff --git a/app/Http/Controllers/OurTradeController.php b/app/Http/Controllers/OurTradeController.php index 5015598..29e7d18 100644 --- a/app/Http/Controllers/OurTradeController.php +++ b/app/Http/Controllers/OurTradeController.php @@ -14,7 +14,7 @@ class OurTradeController extends Controller $secteurs_complexes = BusinessSector::orderBy('order', 'ASC')->where('parent_id', null)->has('children')->with('employees','children.employees')->orderBy('order', 'ASC')->get(); //$secteurs->employees->sortBy('order'); - $nine_videos = Employees::select('video','photo')->whereNotNull('video')->inRandomOrder()->limit(9)->get(); + $nine_videos = Employees::select('video','photo','firstname','lastname','job_title')->whereNotNull('video')->inRandomOrder()->limit(9)->get(); return view('front.ourtrade', compact('secteurs_simples','secteurs_complexes','nine_videos')); } diff --git a/public/css/style.css b/public/css/style.css index 57328c5..4ac42d2 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -1232,6 +1232,7 @@ header .right-menu-mobile #svg-connect:hover, header .right-menu-mobile #svg-sea display: block; width: 90%; margin: 20px; + align-self: flex-start; } .video .screenplay { display: block; @@ -1265,7 +1266,27 @@ header .right-menu-mobile #svg-connect:hover, header .right-menu-mobile #svg-sea } .video .video-diapo { - grid-template-columns: 1fr 1fr 1fr; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr; + } + .video .video-diapo .screenplay.marolles, .video .video-diapo .screenplay.nogent-le-bernard { + grid-column-start: 1; + grid-column-end: 3; + } + .video .video-diapo .screenplay.cherre, .video .video-diapo .screenplay.mamers { + grid-column-start: 3; + grid-column-end: 5; + } + .video .video-diapo .screenplay.monce, .video .video-diapo .screenplay.thoigne-les-mees { + grid-column-start: 5; + grid-column-end: 7; + } + .video .video-diapo .screenplay.les-mees { + grid-column-start: 2; + grid-column-end: 4; + } + .video .video-diapo .screenplay.sille-guillaume { + grid-column-start: 4; + grid-column-end: 6; } .chiffres .infos { @@ -1366,7 +1387,7 @@ header .right-menu-mobile #svg-connect:hover, header .right-menu-mobile #svg-sea } .video .player-bloc { - height: 58vh; + height: 45vh; } .edito { @@ -1597,7 +1618,7 @@ header .right-menu-mobile #svg-connect:hover, header .right-menu-mobile #svg-sea } .work--head--detail { - grid-template-areas: "img" "txt" "mov"; + grid-template-areas: "img" "mov"; grid-gap: 10px; justify-content: center; align-items: flex-start; @@ -1625,8 +1646,29 @@ header .right-menu-mobile #svg-connect:hover, header .right-menu-mobile #svg-sea height: 100%; position: relative; } -.work--head--detail .detail--video a { +.work--head--detail .detail--video div { width: 100%; + align-self: flex-start; + display: flex; + flex-direction: column; +} +.work--head--detail .detail--video div a { + align-self: center; +} +.work--head--detail .detail--video div a img { + width: 100px; +} +.work--head--detail .detail--video div p { + text-align: center; + margin: 0; + font-family: "Open_Sans"; +} +.work--head--detail .detail--video div p:first-child { + font-weight: bold; +} +.work--head--detail .detail--video div p.function { + font-size: 0.875rem; + font-weight: normal; } .work--main { @@ -1736,12 +1778,12 @@ header .right-menu-mobile #svg-connect:hover, header .right-menu-mobile #svg-sea @media only screen and (min-width: 768px) { .work--head--detail { grid-template-columns: repeat(2, 1fr); - grid-template-areas: "txt txt" "img mov"; + grid-template-areas: "img mov"; } .work--head--detail > div { max-width: unset; } - .work--head--detail .detail--video > div:not(:last-child) { + .work--head--detail .detail--video a > div:not(:last-child) { height: 4vw; } @@ -1768,8 +1810,8 @@ header .right-menu-mobile #svg-connect:hover, header .right-menu-mobile #svg-sea } @media only screen and (min-width: 1024px) { .work--head--detail { - grid-template-columns: repeat(3, 1fr); - grid-template-areas: "img txt mov"; + grid-template-columns: repeat(2, 1fr); + grid-template-areas: "img mov"; grid-gap: 2rem; } @@ -1941,15 +1983,18 @@ svg { .rse--bloc .post-chapter, .engag--bloc .post-chapter { grid-area: title; } -.rse--bloc p, .engag--bloc p { +.rse--bloc p, .rse--bloc .rse--text, .engag--bloc p, .engag--bloc .rse--text { grid-area: txt; } +.rse--bloc .rse--text, .engag--bloc .rse--text { + align-self: center; +} .rse--bloc { width: 100%; - height: 300px; grid-template-rows: 200px auto; - grid-template-areas: "img" "title"; + grid-template-columns: auto; + grid-template-areas: "img" "title" "txt"; } .engag--bloc { @@ -1978,13 +2023,13 @@ svg { } @media only screen and (min-width: 768px) { - .rse--content { - grid-template-columns: 1fr 1fr; + .rse--bloc.bloc--left { + grid-template-columns: 250px auto; + grid-template-areas: "img txt" "title ."; } - - .rse--bloc { - height: 250px; - max-width: 250px; + .rse--bloc.bloc--right { + grid-template-columns: auto 250px; + grid-template-areas: "txt img" ". title"; } } @media only screen and (min-width: 1024px) { @@ -2006,13 +2051,14 @@ svg { } @media only screen and (min-width: 1440px) { .rse--content { - grid-template-columns: repeat(4, 1fr); margin: 20px 0 0; } - .rse--bloc { - height: 300px; - max-width: 300px; + .rse--bloc.bloc--left { + grid-template-columns: 1fr 2fr; + } + .rse--bloc.bloc--right { + grid-template-columns: 2fr 1fr; } .engag--blocs { diff --git a/public/images/quarante-salaries-large.jpg b/public/images/quarante-salaries-large.jpg new file mode 100644 index 0000000..ac4f1e9 Binary files /dev/null and b/public/images/quarante-salaries-large.jpg differ diff --git a/public/images/silo-sille.jpg b/public/images/silo-sille.jpg new file mode 100644 index 0000000..586d135 Binary files /dev/null and b/public/images/silo-sille.jpg differ diff --git a/public/js/main.js b/public/js/main.js index a033380..e041357 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -12081,6 +12081,14 @@ $(document).ready(function () { $('.player-bloc.wide iframe').attr("src", "https://player.vimeo.com/video/510306899?autoplay=1"); break; + case "les-mees": + $('.player-bloc.wide iframe').attr("src", "https://player.vimeo.com/video/510306998?autoplay=1"); + break; + + case "sille-guillaume": + $('.player-bloc.wide iframe').attr("src", "images/silo-sille.jpg"); + break; + default: $('.player-bloc.wide iframe').attr("src", "https://player.vimeo.com/video/510306998?autoplay=1"); break; diff --git a/resources/js/main.js b/resources/js/main.js index bd8b3c3..03ceaac 100644 --- a/resources/js/main.js +++ b/resources/js/main.js @@ -69,6 +69,12 @@ $(document).ready(function() { case "thoigne-les-mees": $('.player-bloc.wide iframe').attr("src", "https://player.vimeo.com/video/510306899?autoplay=1") break; + case "les-mees": + $('.player-bloc.wide iframe').attr("src", "https://player.vimeo.com/video/510306998?autoplay=1") + break; + case "sille-guillaume": + $('.player-bloc.wide iframe').attr("src", "images/silo-sille.jpg") + break; default: $('.player-bloc.wide iframe').attr("src", "https://player.vimeo.com/video/510306998?autoplay=1") diff --git a/resources/sass/main.scss b/resources/sass/main.scss index 1551848..812d110 100644 --- a/resources/sass/main.scss +++ b/resources/sass/main.scss @@ -84,7 +84,7 @@ height: 170px; width: 90%; } - } + } .player-bloc, .screenplay{ position: relative; @@ -133,7 +133,7 @@ "second-p" "img" "sign"; - + & div:nth-child(1){grid-area: img; text-align: center;} & div:nth-child(2){grid-area: first-p;} & div:nth-child(3){grid-area: second-p;} @@ -141,7 +141,7 @@ grid-area: sign; margin-top: 20px; text-align: right; - + & p{margin: 0;} & p:first-child{font-weight: bold;} } @@ -174,7 +174,7 @@ .info .post-chapter{ text-align: right; position: relative; - + &::before{ content:""; position: absolute; @@ -206,8 +206,11 @@ display: block; width: 90%; margin: 20px; + align-self: flex-start; + } + .screenplay{ + display: block; } - .screenplay{display: block;} .video-diapo { grid-template-columns: 1fr 1fr; @@ -230,7 +233,7 @@ @media only screen and (min-width:768px) { .hero{ - + .swiper-container{padding-bottom: 40px;} .swiper-container .swiper-slide{flex-direction: row;} .img-slide { @@ -244,7 +247,32 @@ .second-btn{margin: 0;} } } - .video .video-diapo {grid-template-columns: 1fr 1fr 1fr;} + .video .video-diapo { + grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr; + .screenplay { + &.marolles,&.nogent-le-bernard { + grid-column-start: 1; + grid-column-end: 3; + } + &.cherre,&.mamers { + grid-column-start: 3; + grid-column-end: 5; + } + &.monce,&.thoigne-les-mees { + grid-column-start: 5; + grid-column-end: 7; + } + &.les-mees { + grid-column-start: 2; + grid-column-end: 4; + } + &.sille-guillaume { + grid-column-start: 4; + grid-column-end: 6; + } + } + + } .chiffres{ .infos{flex-direction: row;} @@ -287,7 +315,7 @@ } .img-slide { flex: 1; - + img{max-width: unset;} } .txt-slide{flex: 1;} @@ -303,7 +331,7 @@ flex-direction: row; justify-content: space-between; align-items: center; - + & > div{width: 50%;} } // .player-bloc{height: 25vh;} @@ -319,7 +347,7 @@ } .edito{ // grid-template-columns: 2fr 3fr; - grid-template-areas: + grid-template-areas: "img first-p" "second-p second-p" "sign sign"; @@ -365,7 +393,7 @@ // ********* * // ***** * // ** * -// ** * +// ** * // ********** * // * * // ********* * @@ -378,9 +406,9 @@ @media only screen and (min-width: 1920px) { .hero .txt-slide{ flex: 2;} // .video .player-bloc{height: 48vh;} - .video .player-bloc{height: 58vh;} + .video .player-bloc{height: 45vh;} .edito{ padding-left: 500px; padding-right: 500px; } -} \ No newline at end of file +} diff --git a/resources/sass/rse.scss b/resources/sass/rse.scss index a923738..8a70feb 100644 --- a/resources/sass/rse.scss +++ b/resources/sass/rse.scss @@ -51,17 +51,27 @@ svg{ padding: 20px; } .post-chapter{grid-area: title;} - p{grid-area: txt;} + p, .rse--text{grid-area: txt;} + .rse--text { + align-self: center; + //text-align: initial; + } text-align: center; } .rse--bloc{ - width: 100%; height: 300px; + width: 100%; + //height: 300px; // max-width: 300px; + grid-template-rows: 200px auto; + grid-template-columns: auto; grid-template-areas: "img" - "title"; + "title" + "txt"; } + + .engag--bloc{ width: 100%; height: 400px; max-width: 400px; @@ -80,7 +90,16 @@ svg{ } @media only screen and (min-width:420px) { - + .rse--bloc{ + // height: 300px; + // &.bloc--left,&.bloc--right { + // grid-template-columns: auto; + // grid-template-areas: + // "img" + // "title" + // "txt"; + // } + } } // ************************* @@ -97,11 +116,23 @@ svg{ @media only screen and (min-width:768px) { .rse--content{ - grid-template-columns: 1fr 1fr; + //grid-template-columns: 1fr 1fr; } .rse--bloc{ - height: 250px; - max-width: 250px; + // height: 250px; + // max-width: 250px; + &.bloc--left { + grid-template-columns: 250px auto; + grid-template-areas: + "img txt" + "title ."; + } + &.bloc--right { + grid-template-columns: auto 250px; + grid-template-areas: + "txt img" + ". title"; + } } } @@ -160,13 +191,19 @@ svg{ // ***************** @media only screen and (min-width: 1440px) { .rse--content{ - grid-template-columns: repeat(4, 1fr); + //grid-template-columns: repeat(2, 1fr); margin: 20px 0 0; } // .rse--bloc, .engag--bloc{margin: 20px;} .rse--bloc{ - height: 300px; - max-width: 300px; + // height: 300px; + // max-width: 300px; + &.bloc--left { + grid-template-columns: 1fr 2fr; + } + &.bloc--right { + grid-template-columns: 2fr 1fr; + } } .engag--blocs{ grid-template-columns: repeat(6, 1fr); @@ -187,7 +224,7 @@ svg{ // ********* * // ***** * // ** * -// ** * +// ** * // ********** * // * * // ********* * @@ -202,4 +239,4 @@ svg{ max-width: 500px; height: 500px; } -} \ No newline at end of file +} diff --git a/resources/sass/work.scss b/resources/sass/work.scss index a3d4d3e..7f403b9 100644 --- a/resources/sass/work.scss +++ b/resources/sass/work.scss @@ -31,7 +31,6 @@ .work--head--detail{ grid-template-areas: "img" - "txt" "mov"; grid-gap: 10px; justify-content: center; @@ -54,7 +53,30 @@ height: 100%; position: relative; - a{width: 100%;} + div{ + width: 100%; + align-self: flex-start; + display: flex; + flex-direction: column; + a{ + align-self: center; + img { + width: 100px; + } + } + p { + text-align: center; + margin: 0; + font-family: "Open_Sans"; + } + p:first-child { + font-weight: bold; + } + p.function { + font-size: 0.875rem; + font-weight: normal; + } + } } } .work--main{ @@ -150,11 +172,11 @@ .work--head--detail{ grid-template-columns: repeat(2, 1fr); grid-template-areas: - "txt txt" + //"txt txt" "img mov"; & > div{max-width: unset;} - .detail--video > div:not(:last-child){ + .detail--video a > div:not(:last-child){ height: 4vw; } } @@ -197,8 +219,8 @@ @media only screen and (min-width:1024px) { .work--head--detail{ - grid-template-columns: repeat(3, 1fr); - grid-template-areas: "img txt mov"; + grid-template-columns: repeat(2, 1fr); + grid-template-areas: "img mov"; grid-gap: 2rem; } .milaceanous{ diff --git a/resources/views/front/csr.blade.php b/resources/views/front/csr.blade.php index 917f49c..7cdffec 100644 --- a/resources/views/front/csr.blade.php +++ b/resources/views/front/csr.blade.php @@ -5,9 +5,9 @@
 }})
 }})
Progressively disseminate high-payoff niche markets without enterprise action items. Completely provide access to cutting-edge methods of empowerment before synergistic networks. Conveniently orchestrate user friendly data before.
Lorem ipsum, dolor sit amet consectetur adipisicing elit. Nesciunt, pariatur architecto facere magnam amet ab reprehenderit suscipit delectus veniam illo hic! Beatae iusto non natus doloremque cum! Distinctio, in praesentium!
-{{$video->firstname}} {{$video->lastname}}
+{{$video->job_title}}
+
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 99b6a34..7923d45 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -37,66 +37,26 @@
- Marolles
- -
- Cherré
- -
- Moncé
- -
- Nogent-le-Bernard
- -
- Mamers
- -
- Thoigné
- +
-
+
+ Marolles
+ +
+ Cherré
+ +
+ Moncé
+ +
+ Nogent-le-Bernard
+ +
+ Mamers
+ +
+ Thoigné
+ +
+ Les Mées
+ +
+ Sillé le Guillaume
+