diff --git a/public/assets/fonts/CreamyScript.woff2 b/public/assets/fonts/CreamyScript.woff2 new file mode 100644 index 0000000..0b232c4 Binary files /dev/null and b/public/assets/fonts/CreamyScript.woff2 differ diff --git a/public/assets/images/logo_avis.png b/public/assets/images/logo_avis.png index ebda28f..da3a3de 100644 Binary files a/public/assets/images/logo_avis.png and b/public/assets/images/logo_avis.png differ diff --git a/public/assets/images/logo_informer.png b/public/assets/images/logo_informer.png index ddafc48..63bf67a 100644 Binary files a/public/assets/images/logo_informer.png and b/public/assets/images/logo_informer.png differ diff --git a/public/assets/images/logo_liens.png b/public/assets/images/logo_liens.png index b57bd6c..4797ab7 100644 Binary files a/public/assets/images/logo_liens.png and b/public/assets/images/logo_liens.png differ diff --git a/public/assets/images/logo_planning.png b/public/assets/images/logo_planning.png index 22551ae..9ddaa1f 100644 Binary files a/public/assets/images/logo_planning.png and b/public/assets/images/logo_planning.png differ diff --git a/public/assets/images/logo_question.png b/public/assets/images/logo_question.png index 2399cda..a93cb79 100644 Binary files a/public/assets/images/logo_question.png and b/public/assets/images/logo_question.png differ diff --git a/resources/assets/fonts/CreamyScript.woff2 b/resources/assets/fonts/CreamyScript.woff2 new file mode 100644 index 0000000..0b232c4 Binary files /dev/null and b/resources/assets/fonts/CreamyScript.woff2 differ diff --git a/resources/assets/images/logo_avis.png b/resources/assets/images/logo_avis.png index ebda28f..da3a3de 100644 Binary files a/resources/assets/images/logo_avis.png and b/resources/assets/images/logo_avis.png differ diff --git a/resources/assets/images/logo_informer.png b/resources/assets/images/logo_informer.png index ddafc48..63bf67a 100644 Binary files a/resources/assets/images/logo_informer.png and b/resources/assets/images/logo_informer.png differ diff --git a/resources/assets/images/logo_liens.png b/resources/assets/images/logo_liens.png index b57bd6c..4797ab7 100644 Binary files a/resources/assets/images/logo_liens.png and b/resources/assets/images/logo_liens.png differ diff --git a/resources/assets/images/logo_planning.png b/resources/assets/images/logo_planning.png index 22551ae..9ddaa1f 100644 Binary files a/resources/assets/images/logo_planning.png and b/resources/assets/images/logo_planning.png differ diff --git a/resources/assets/images/logo_question.png b/resources/assets/images/logo_question.png index 2399cda..a93cb79 100644 Binary files a/resources/assets/images/logo_question.png and b/resources/assets/images/logo_question.png differ diff --git a/resources/js/vendor/dropdown.js b/resources/js/vendor/dropdown.js index 8bb160b..6672540 100644 --- a/resources/js/vendor/dropdown.js +++ b/resources/js/vendor/dropdown.js @@ -1,11 +1,12 @@ dropContent = function dropContent() { - var x = document.getElementById("mainNav"); - var y = document.getElementById("loginNav"); - if (x.className === "navbar-links") { - x.className += " responsive"; - y.className = "dropdown-content-mobile"; + var x = document.getElementById("sideNavID"); + var y = document.getElementById("menuID"); + if (x.className === "dropMenu" && y.className === "sideNavMenu") { + x.className += " active"; + y.className += " active"; } else { - x.className = "navbar-links"; + x.className = "dropMenu"; + y.className = "sideNavMenu"; } } diff --git a/resources/sass/front/partial/_fonts.sass b/resources/sass/front/partial/_fonts.sass index cad4940..49e9c65 100644 --- a/resources/sass/front/partial/_fonts.sass +++ b/resources/sass/front/partial/_fonts.sass @@ -19,4 +19,14 @@ $font-mobile-small: 10px $font-stack2: Times,Century Gothic,Berlin Sans FB, Arial, Helvetica, sans-serif $font-stack3: Century Gothic,Berlin Sans FB, Arial, Helvetica, sans-serif $font-stack4: Yu Gothic Bold,Berlin Sans FB, Arial, Helvetica, sans-serif -$font-stackNav: mont,Times,Century Gothic,Berlin Sans FB +$font-stackNav: 'Open Sans', sans-serif +$font-Normal: 'Open Sans', sans-serif + + + + +@font-face + font-family: "CreamyScript" + src: url('/assets/fonts/CreamyScript.woff2') format('woff2') + font-weight: normal + font-style: normal diff --git a/resources/sass/front/partial/_footer.sass b/resources/sass/front/partial/_footer.sass index 1b1a66a..9fe8c4a 100644 --- a/resources/sass/front/partial/_footer.sass +++ b/resources/sass/front/partial/_footer.sass @@ -13,7 +13,7 @@ img transform: scale(0.8, 0.8) &__coordonnees - font-family: $font-stack3 + font-family: $font-Normal &__content margin-bottom: 10px text-align: center @@ -35,7 +35,6 @@ img transform: scale(0.6, 0.6) &__coordonnees - font-family: $font-stack3 &__content margin-bottom: 10px text-align: center diff --git a/resources/sass/front/partial/_header.sass b/resources/sass/front/partial/_header.sass index 94c7c5e..e1a937a 100644 --- a/resources/sass/front/partial/_header.sass +++ b/resources/sass/front/partial/_header.sass @@ -18,7 +18,7 @@ header flex-grow: 1 color: $white - font-size: 1.5em + font-size: 2.5em .navbarLeft display: flex justify-content: flex-end @@ -107,7 +107,8 @@ header height: 52px .greetings color: $white - font-size: large + font-size: 1.5em + font-family: 'CreamyScript' .logo color: #fff height: $height_nav @@ -148,9 +149,12 @@ header //For 4k screen @media screen and (min-width: map-get($breakpoints,UHD)) header + .surHeader + .greetings + font-size: 2em nav .siteName - font-size: 2em + font-size: 3.5em a font-size: $font-size_nav4k .dropdown @@ -262,4 +266,4 @@ header header .surHeader .greetings - font-size: small \ No newline at end of file + font-size: medium \ No newline at end of file diff --git a/resources/sass/front/partial/_planning.sass b/resources/sass/front/partial/_planning.sass index eb7a91c..fdf2cb7 100644 --- a/resources/sass/front/partial/_planning.sass +++ b/resources/sass/front/partial/_planning.sass @@ -13,7 +13,7 @@ margin: 10px text-align: center padding: 7px - font-style: $font-stack4 + font-style: $font-Normal font-size: 15px color: white cursor: pointer @@ -24,7 +24,7 @@ justify-content: center width: 100% - height: auto + min-height: 500px padding: 15px padding-bottom: 20px diff --git a/resources/sass/front/style.sass b/resources/sass/front/style.sass index 4b38cae..86a7010 100644 --- a/resources/sass/front/style.sass +++ b/resources/sass/front/style.sass @@ -29,14 +29,73 @@ body font-family: $font-stack2 line-height: 1 +a + text-decoration: none +.creamyFont + font-family: CreamyScript /** Containt **/ .wrapper + display: flex flex-grow: 1 + margin: auto + width: 80% + margin-bottom: 30px + .sideNavMenu + display: none + color: $white + height: 66px + .sideNav //Barre de navigation + display: flex + flex-flow: column nowrap + margin-right: 50px + .dropMenu + background-color: var(--primary-color) + &-logo + position: relative + text-align: center + height: 150px + margin: 20px 0 20px 40px + img + height: 150px + h1 + position: absolute + top: 65% + right: 7% + transform: translate(-50%, -50%) + margin: 0px + color: var(--primary-color) + font-size: 2em + letter-spacing: 2px + &-lien + display: flex + width: 315px + height: 80px + border-bottom: 2px solid $white + font-family: 'CreamyScript' + background: var(--primary-color) + &.active + background: var(--secondary-color) + div + display: flex + justify-content: center + align-items: center + margin-left: 10px + margin-right: 50px + img + width: 40px + height: 40px + p + display: flex + justify-content: center + align-items: center + color: $white .title //les titres margin: 10px auto text-align: center font-size: 20px color: var(--secondary-color) + font-family: 'CreamyScript' + letter-spacing: 2px &Normal text-align: left color: var(--secondary-color) @@ -88,20 +147,19 @@ body .container-pageLogo //Logo page position: relative text-align: center - height: 100px + height: 150px img - width: 100px - height: 100px + height: 150px h1 position: absolute - top: 50% + top: 60% left: 50% transform: translate(-50%, -50%) margin: 0px + font-size: 2em &-main margin-top: 20px padding: 20px - height: 100% background: lighten( $body-color,6% ) .container-main__bloc //Page Liens Utiles margin: 0 30px 30px 0px @@ -241,6 +299,10 @@ body //for 4k screen @media screen and (min-width: map-get($breakpoints, UHD)) .wrapper + .sideNav-lien + p + font-size: 1.3em + color: $white .title font-size: $font-size_4k_title .container @@ -290,10 +352,100 @@ body a font-size: $font-size_4k_normal_plus +//for tablet +@media screen and (max-width: map-get($breakpoints, tablet)) + //Navigation Menu + .wrapper + flex-direction: column + .container + .container-pageLogo + height: 120px + img + height: 120px + .dropMenu + visibility: hidden + opacity: 0 + height: 0 + transition: all 0.7s linear + &.active + visibility: visible + opacity: 1 + height: auto + .sideNav-logo + height: 120px + img + height: 120px + h1 + left: 47% + right: unset + width: 80% + .sideNav + margin-right: unset + .sideNavMenu + display: block + padding-top: 16px + + background-color: var(--primary-color) + text-align: center + font-size: 30px + font-family: "CreamyScript" + &::after + content: '' + display: block + width: 0 + height: 0 + border-style: solid + border-width: 10px 10px 0 10px + border-color: #ffffff transparent transparent transparent + position: relative + top: -35% + left: 95% + transition: all 0.8s + &.active + border-bottom: 2px solid $white + &::after + transform: rotate(180deg) + transform-origin: 50% 33 + .sideNav-lien + width: 100% + height: 66px + div + margin-left: 30px + img + width: 45px + height: 45px + p + flex-grow: 1 + margin-right: 18% + font-size: 1.4em + + //for mobile-smaller @media screen and (max-width: map-get($breakpoints, mobile-small)) + .wrapper + width: 90% + .container-main + padding: 3px + .container + width: 100% + .container-pageLogo + height: 100px + img + height: 100px + .sideNavMenu + &::after + left: 90% + .sideNav-lien + p + font-size: 1em + .sideNav-logo + height: 100px + img + height: 100px + h1 + left: 43% .wrapper .container .container-main__Sondage form .container__body .container__reponse margin: 0 5px 7px 5px .swiper-container diff --git a/resources/views/front/employees/plannings.blade.php b/resources/views/front/employees/plannings.blade.php index ea506ef..38334bd 100644 --- a/resources/views/front/employees/plannings.blade.php +++ b/resources/views/front/employees/plannings.blade.php @@ -3,37 +3,81 @@ @section("title", 'Mon planning') @section("content") -
-
- @include('front.partials.containerPageLogo', ['title' => 'Votre Planning']) -
-
-
Semaine en cours
-
Semaine suivante
+
+ +
+ + + + + +
+ + +
+
+
Semaine en cours
+
Semaine suivante
+
+
+
+ @if($plannings->get('now')) + @include('front.employees.planning', [ + 'planning' => $plannings->get('now') + ]) + @else + Données indisponibles. + @endif
- +
-@endsection +
+@endsection \ No newline at end of file diff --git a/resources/views/front/liensUtiles.blade.php b/resources/views/front/liensUtiles.blade.php index e664d87..cebdeed 100644 --- a/resources/views/front/liensUtiles.blade.php +++ b/resources/views/front/liensUtiles.blade.php @@ -3,61 +3,97 @@ @section("title", 'Liens utiles') @section("content") -
-
- @include('front.partials.containerPageLogo', ['title' => 'Liens utiles']) -
-
-

Vos projets de formation

-

Vous avez des projets de formation... Vous trouverez de nombreuses informations utiles sur ces différents liens:

-
- moncompteactivite.gouv.fr - fongecif-pdl.fr - opcalim.org -
+
+ +
+ + + + + +
+
+ @include('front.partials.containerPageLogo', ['title' => 'Liens utiles']) +
+
+

Vos projets de formation

+

Vous avez des projets de formation... Vous trouverez de nombreuses informations utiles sur ces différents liens:

+
+ moncompteactivite.gouv.fr + fongecif-pdl.fr + opcalim.org
-
-

Votre santé

-

Suivez vos frais de santé : sur le site de la Sécurité sociale (Améli), ou sur celui de la mutuelle de l’entreprise (Génération)

-
- ameli.fr - generation.fr -
-
- -
-

Votre épargne Entreprise

-

Suivez vos versements sur le plan d’épargne groupe sur ce site.

-
- cic-epargnesalariale.fr -
-
- - -
-

Votre logement

-

En tant que salarié, cet organisme vous propose des solutions et des accompagnements autour du logement.

-
- actionlogement.fr -
-
- -
-

Notre groupe

-

Allez consulter le site internet de notre Groupe.

-
- ldc.fr -
-
- - - -
+
+

Votre santé

+

Suivez vos frais de santé : sur le site de la Sécurité sociale (Améli), ou sur celui de la mutuelle de l’entreprise (Génération)

+
+ ameli.fr + generation.fr +
+
+ +
+

Votre épargne Entreprise

+

Suivez vos versements sur le plan d’épargne groupe sur ce site.

+
+ cic-epargnesalariale.fr +
+
+ + +
+

Votre logement

+

En tant que salarié, cet organisme vous propose des solutions et des accompagnements autour du logement.

+
+ actionlogement.fr +
+
+ +
+

Notre groupe

+

Allez consulter le site internet de notre Groupe.

+
+ ldc.fr +
+
+ +
+
-@endsection +
+ +@endsection \ No newline at end of file diff --git a/resources/views/layouts/frontend/header.blade.php b/resources/views/layouts/frontend/header.blade.php index 9d6ebd3..f4980cb 100644 --- a/resources/views/layouts/frontend/header.blade.php +++ b/resources/views/layouts/frontend/header.blade.php @@ -14,12 +14,12 @@
-
+
Accès salariés
-