From d16c80801e39fa3fa48ab6b2b702a2d0b5f72fac Mon Sep 17 00:00:00 2001 From: Sebastien Hattry Date: Mon, 15 Mar 2021 10:22:05 +0100 Subject: [PATCH] Congratulate page BR modification (picture, wording) + homepage wording modification (tefal) --- public/css/styles.css | 141 ++++++++++++------ resources/sass/front/common.scss | 21 +-- resources/sass/front/congratulate.scss | 21 ++- resources/sass/front/connect.scss | 4 +- resources/sass/front/footer.scss | 5 +- resources/sass/front/header.scss | 6 +- resources/views/front/basic/end.blade.php | 9 +- resources/views/front/basic/home.blade.php | 4 +- resources/views/front/basic/login.blade.php | 4 +- .../front/basic/partials/footer.blade.php | 33 +++- .../basic/participation-exhausted.blade.php | 9 +- .../views/front/basic/reduction.blade.php | 13 +- 12 files changed, 195 insertions(+), 75 deletions(-) diff --git a/public/css/styles.css b/public/css/styles.css index 670a018..f1cf50d 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -652,7 +652,7 @@ footer input { header .rest-in-game > div div:first-child span, footer .rest-in-game > div div:first-child span { font-size: 4rem; - line-height: 4.4rem; + line-height: 4rem; } footer a { @@ -775,6 +775,11 @@ section { } .alert-success { + margin: 0 10vw; + color: #00803a; +} + +.alert-success p { color: #00803a; } @@ -818,7 +823,7 @@ section { header .rest-in-game > div div:first-child span, footer .rest-in-game > div div:first-child span { font-size: 1.9rem; - line-height: 2rem; + line-height: 1.9rem; } footer .footer--legals a { @@ -894,7 +899,7 @@ section { header .rest-in-game > div div:first-child span, footer .rest-in-game > div div:first-child span { font-size: 1.5rem; - line-height: 1.7rem; + line-height: 1.5rem; } footer .footer--legals a { @@ -916,12 +921,6 @@ section { font-size: 1rem; line-height: 1.2rem; } - - header a, - footer a { - font-size: 1rem; - line-height: 1.2rem; - } } :root { @@ -971,6 +970,7 @@ header nav { header nav.active { left: 0; + text-align: center; } header nav ul { @@ -1177,6 +1177,7 @@ header .rest-in-game > div div:first-child { } header .rest-in-game > div div:first-child span { + display: contents; font-family: "Barlow Bold", Arial, Helvetica, sans-serif; color: #e30613; } @@ -2122,14 +2123,16 @@ header .rest-in-game > div img { .connect, .register, .fancybox-container, -.discover { +.discover, +.code { background: repeat url(/images/bg-paper.jpg?78808a48f7cb9222abb9112b5cf77efb); } .connect .title-inscription1, .register .title-inscription1, .fancybox-container .title-inscription1, -.discover .title-inscription1 { +.discover .title-inscription1, +.code .title-inscription1 { text-align: center; margin-bottom: 40px; } @@ -2141,7 +2144,9 @@ header .rest-in-game > div img { .fancybox-container .post-title, .fancybox-container .post-chapter, .discover .post-title, -.discover .post-chapter { +.discover .post-chapter, +.code .post-title, +.code .post-chapter { font-size: 6.5rem; color: #00803a; margin-bottom: 20px; @@ -2155,20 +2160,22 @@ header .rest-in-game > div img { .fancybox-container input, .fancybox-container select, .discover input, -.discover select { +.discover select, +.code input, +.code select { border: none; background-color: #e3e9d9; padding: 10px; margin: 10px 0; } -.connect input::-moz-placeholder, .register input::-moz-placeholder, .fancybox-container input::-moz-placeholder, .discover input::-moz-placeholder { +.connect input::-moz-placeholder, .register input::-moz-placeholder, .fancybox-container input::-moz-placeholder, .discover input::-moz-placeholder, .code input::-moz-placeholder { font-size: 3.5rem; color: #024e2a; font-family: "Barlow Bold", Arial, Helvetica, sans-serif; } -.connect input:-ms-input-placeholder, .register input:-ms-input-placeholder, .fancybox-container input:-ms-input-placeholder, .discover input:-ms-input-placeholder { +.connect input:-ms-input-placeholder, .register input:-ms-input-placeholder, .fancybox-container input:-ms-input-placeholder, .discover input:-ms-input-placeholder, .code input:-ms-input-placeholder { font-size: 3.5rem; color: #024e2a; font-family: "Barlow Bold", Arial, Helvetica, sans-serif; @@ -2185,7 +2192,10 @@ header .rest-in-game > div img { .fancybox-container select, .discover input, .discover input::placeholder, -.discover select { +.discover select, +.code input, +.code input::placeholder, +.code select { font-size: 3.5rem; color: #024e2a; font-family: "Barlow Bold", Arial, Helvetica, sans-serif; @@ -2202,14 +2212,18 @@ header .rest-in-game > div img { .fancybox-container label, .discover p, .discover span, -.discover label { +.discover label, +.code p, +.code span, +.code label { color: #212121; } .connect p, .register p, .fancybox-container p, -.discover p { +.discover p, +.code p { font-family: "Barlow Medium", Arial, Helvetica, sans-serif; font-size: 3.5rem; line-height: 4rem; @@ -2218,7 +2232,8 @@ header .rest-in-game > div img { .connect .main--bloc, .register .main--bloc, .fancybox-container .main--bloc, -.discover .main--bloc { +.discover .main--bloc, +.code .main--bloc { text-align: center; margin-bottom: 10vw; } @@ -2238,7 +2253,11 @@ header .rest-in-game > div img { .discover .mobile-menu, .discover .signup--bloc, .discover .connect--bloc, -.discover .edit--blocs { +.discover .edit--blocs, +.code .mobile-menu, +.code .signup--bloc, +.code .connect--bloc, +.code .edit--blocs { flex-direction: column; } @@ -2249,7 +2268,9 @@ header .rest-in-game > div img { .fancybox-container .signup--bloc, .fancybox-container .connect--bloc, .discover .signup--bloc, -.discover .connect--bloc { +.discover .connect--bloc, +.code .signup--bloc, +.code .connect--bloc { margin: 0 10vw; padding: 7vw 0; text-align: center; @@ -2262,42 +2283,49 @@ header .rest-in-game > div img { .fancybox-container .signup--bloc p, .fancybox-container .connect--bloc p, .discover .signup--bloc p, -.discover .connect--bloc p { +.discover .connect--bloc p, +.code .signup--bloc p, +.code .connect--bloc p { margin: 4vw 0; } .connect .edit--blocs h2, .register .edit--blocs h2, .fancybox-container .edit--blocs h2, -.discover .edit--blocs h2 { +.discover .edit--blocs h2, +.code .edit--blocs h2 { font-size: 100%; } .connect .desktop-menu, .register .desktop-menu, .fancybox-container .desktop-menu, -.discover .desktop-menu { +.discover .desktop-menu, +.code .desktop-menu { display: none; } .connect .mobile-menu .signup--bloc, .register .mobile-menu .signup--bloc, .fancybox-container .mobile-menu .signup--bloc, -.discover .mobile-menu .signup--bloc { +.discover .mobile-menu .signup--bloc, +.code .mobile-menu .signup--bloc { border-bottom: 3px solid #00803a; } .connect .mobile-menu .signup--bloc p, .register .mobile-menu .signup--bloc p, .fancybox-container .mobile-menu .signup--bloc p, -.discover .mobile-menu .signup--bloc p { +.discover .mobile-menu .signup--bloc p, +.code .mobile-menu .signup--bloc p { margin: 4vw 0 0; } .connect .mobile-menu .btn-connect a, .register .mobile-menu .btn-connect a, .fancybox-container .mobile-menu .btn-connect a, -.discover .mobile-menu .btn-connect a { +.discover .mobile-menu .btn-connect a, +.code .mobile-menu .btn-connect a { padding: 15px; border-radius: 10px; font-size: 6rem; @@ -2313,14 +2341,16 @@ header .rest-in-game > div img { .connect .mobile-menu .btn-connect a:hover, .register .mobile-menu .btn-connect a:hover, .fancybox-container .mobile-menu .btn-connect a:hover, -.discover .mobile-menu .btn-connect a:hover { +.discover .mobile-menu .btn-connect a:hover, +.code .mobile-menu .btn-connect a:hover { background: radial-gradient(circle closest-corner at 25% 90%, #54af7d, #024E2A); } .connect .desktop-menu .btn-connect, .register .desktop-menu .btn-connect, .fancybox-container .desktop-menu .btn-connect, -.discover .desktop-menu .btn-connect { +.discover .desktop-menu .btn-connect, +.code .desktop-menu .btn-connect { margin: 0 auto; } @@ -2331,7 +2361,9 @@ header .rest-in-game > div img { .fancybox-container .desktop-menu .btn-connect a, .fancybox-container .desktop-menu input.btn, .discover .desktop-menu .btn-connect a, -.discover .desktop-menu input.btn { +.discover .desktop-menu input.btn, +.code .desktop-menu .btn-connect a, +.code .desktop-menu input.btn { font-family: "Barlow Condensed Semi Bold", Arial, Helvetica, sans-serif; font-size: 4rem; color: #ffffff; @@ -2352,14 +2384,17 @@ header .rest-in-game > div img { .fancybox-container .desktop-menu .btn-connect a:hover, .fancybox-container .desktop-menu input.btn:hover, .discover .desktop-menu .btn-connect a:hover, -.discover .desktop-menu input.btn:hover { +.discover .desktop-menu input.btn:hover, +.code .desktop-menu .btn-connect a:hover, +.code .desktop-menu input.btn:hover { background-color: #024e2a; } .connect .desktop-menu .btn-connect a, .register .desktop-menu .btn-connect a, .fancybox-container .desktop-menu .btn-connect a, -.discover .desktop-menu .btn-connect a { +.discover .desktop-menu .btn-connect a, +.code .desktop-menu .btn-connect a { padding: 0.7em 0.5em; } @@ -2625,15 +2660,17 @@ header .rest-in-game > div img { .fancybox-container .post-title, .fancybox-container .post-chapter, .discover .post-title, - .discover .post-chapter { + .discover .post-chapter, + .code .post-title, + .code .post-chapter { font-size: 4rem; } - .connect input::-moz-placeholder, .register input::-moz-placeholder, .fancybox-container input::-moz-placeholder, .discover input::-moz-placeholder { + .connect input::-moz-placeholder, .register input::-moz-placeholder, .fancybox-container input::-moz-placeholder, .discover input::-moz-placeholder, .code input::-moz-placeholder { font-size: 1.5rem; } - .connect input:-ms-input-placeholder, .register input:-ms-input-placeholder, .fancybox-container input:-ms-input-placeholder, .discover input:-ms-input-placeholder { + .connect input:-ms-input-placeholder, .register input:-ms-input-placeholder, .fancybox-container input:-ms-input-placeholder, .discover input:-ms-input-placeholder, .code input:-ms-input-placeholder { font-size: 1.5rem; } @@ -2648,14 +2685,18 @@ header .rest-in-game > div img { .fancybox-container select, .discover input, .discover input::placeholder, - .discover select { + .discover select, + .code input, + .code input::placeholder, + .code select { font-size: 1.5rem; } .connect p, .register p, .fancybox-container p, - .discover p { + .discover p, + .code p { font-size: 1.5rem; line-height: 2.2rem; } @@ -2663,14 +2704,16 @@ header .rest-in-game > div img { .connect .main--bloc, .register .main--bloc, .fancybox-container .main--bloc, - .discover .main--bloc { + .discover .main--bloc, + .code .main--bloc { margin-bottom: 2vw; } .connect .mobile-menu .btn-connect a, .register .mobile-menu .btn-connect a, .fancybox-container .mobile-menu .btn-connect a, - .discover .mobile-menu .btn-connect a { + .discover .mobile-menu .btn-connect a, + .code .mobile-menu .btn-connect a { font-size: 6rem; line-height: 6.6rem; } @@ -2682,7 +2725,9 @@ header .rest-in-game > div img { .fancybox-container .desktop-menu .btn-connect a, .fancybox-container .desktop-menu input.btn, .discover .desktop-menu .btn-connect a, - .discover .desktop-menu input.btn { + .discover .desktop-menu input.btn, + .code .desktop-menu .btn-connect a, + .code .desktop-menu input.btn { font-size: 2rem; } @@ -2911,6 +2956,10 @@ header .rest-in-game > div img { background-color: rgba(0, 0, 0, 0.5); } +.congratulate .mobile--menu .title--txt .main-btn { + margin: 8vw 0; +} + .congratulate .title--bloc.view-lot1 { background-image: url(/images/view-lot1.jpg?f196a23ddd3674b304d81e427672ad38); } @@ -2938,11 +2987,13 @@ header .rest-in-game > div img { text-align: center; } +.congratulate .mobile--menu .title--txt .main-btn a, .congratulate .play--bloc .main-btn a { background-color: #00803a; transition: background-color 0.5s; } +.congratulate .mobile--menu .title--txt .main-btn a:hover, .congratulate .play--bloc .main-btn a:hover { background-color: #024e2a; } @@ -3000,7 +3051,9 @@ header .rest-in-game > div img { } .congratulate .desktop--menu .img--bloc.view-br { - background-image: url(/images/view-br.jpg?c01f1a619f58b708a445fe550dbe7d27); + background-image: url(/images/logo-br.png?8a2f975f9382a42c7cbf0e92ea9b79bb); + background-size: auto; + background-repeat: no-repeat; } .congratulate .desktop--menu .txt--bloc { @@ -3160,6 +3213,10 @@ footer .footer--share svg:hover { fill: #024e2a; } +footer .footer--share .fb-share-button { + cursor: pointer; +} + footer .footer--news { margin: 20px 0; } @@ -3256,7 +3313,7 @@ footer .footer--legals p { } footer .footer--share svg { - width: 3.5vw; + width: 2.5vw; margin: 0 5px; } diff --git a/resources/sass/front/common.scss b/resources/sass/front/common.scss index 862f1c5..7f6a081 100644 --- a/resources/sass/front/common.scss +++ b/resources/sass/front/common.scss @@ -32,7 +32,7 @@ header, footer{ } .rest-in-game > div div:first-child span{ font-size: 4rem; - line-height: 4.4rem; + line-height: 4rem; } } footer a{ @@ -160,7 +160,10 @@ section {padding: 30px 0;} li{color: $secondary;} } .alert-success{ + margin: 0 10vw; color: $primary; + + p{color: $primary;} } // ************************* // ** ** @@ -200,7 +203,7 @@ section {padding: 30px 0;} // } .rest-in-game > div div:first-child span{ font-size: 1.9rem; - line-height: 2rem; + line-height: 1.9rem; } } footer .footer--legals a{ @@ -293,7 +296,7 @@ section {padding: 30px 0;} // } .rest-in-game > div div:first-child span{ font-size: 1.5rem; - line-height: 1.7rem; + line-height: 1.5rem; } } footer .footer--legals a{ @@ -328,12 +331,12 @@ section {padding: 30px 0;} font-size: 1rem; line-height: 1.2rem; } - header, footer{ - a{ - font-size: 1rem; - line-height: 1.2rem; - } - } + // header, footer{ + // a{ + // font-size: 1rem; + // line-height: 1.2rem; + // } + // } } // @media (prefers-reduced-motion: reduce) { diff --git a/resources/sass/front/congratulate.scss b/resources/sass/front/congratulate.scss index cc7e183..080d18a 100644 --- a/resources/sass/front/congratulate.scss +++ b/resources/sass/front/congratulate.scss @@ -49,6 +49,7 @@ background-color: hsla(0, 100%, 0%, .5); } } + .mobile--menu .title--txt .main-btn{margin: 8vw 0;} .title--bloc.view-lot1{background-image: url(../images/view-lot1.jpg);} .title--bloc.view-lot2{background-image: url(../images/view-lot2.jpg);} .title--bloc.view-br{background-image: url(../images/view-br.jpg);} @@ -63,15 +64,15 @@ .main-btn{ margin: 10vw 0 22vw; text-align: center; - - a{ - background-color: $primary; - transition: background-color .5s; - - &:hover{background-color: $tertiary;} - } } } + .mobile--menu .title--txt .main-btn a, + .play--bloc .main-btn a{ + background-color: $primary; + transition: background-color .5s; + + &:hover{background-color: $tertiary;} + } } // ************************* @@ -141,7 +142,11 @@ } .img--bloc.view-lot1{background-image: url(../images/view-lot1.jpg);} .img--bloc.view-lot2{background-image: url(../images/view-lot2.jpg);} - .img--bloc.view-br{background-image: url(../images/view-br.jpg);} + .img--bloc.view-br{ + background-image: url(../images/logo-br.png); + background-size: auto; + background-repeat: no-repeat + } .txt--bloc{ position: absolute; left: 48%; top: 4vw; diff --git a/resources/sass/front/connect.scss b/resources/sass/front/connect.scss index 4fd9914..38e079f 100644 --- a/resources/sass/front/connect.scss +++ b/resources/sass/front/connect.scss @@ -14,7 +14,7 @@ .result{ flex-direction: column; } -.connect, .register, .fancybox-container, .discover{ +.connect, .register, .fancybox-container, .discover, .code{ background: repeat url(../images/bg-paper.jpg); .title-inscription1 { @@ -344,7 +344,7 @@ // ******* @media only screen and (min-width: 768px) { - .connect, .register, .fancybox-container, .discover{ + .connect, .register, .fancybox-container, .discover, .code{ .post-title, .post-chapter{ font-size: 4rem; } diff --git a/resources/sass/front/footer.scss b/resources/sass/front/footer.scss index e668380..1909ce6 100644 --- a/resources/sass/front/footer.scss +++ b/resources/sass/front/footer.scss @@ -44,6 +44,9 @@ footer{ &:hover{fill: $tertiary;} } + .fb-share-button{ + cursor: pointer; + } } .footer--news{ margin: 20px 0; @@ -126,7 +129,7 @@ footer{ .footer--socials{margin: 0;} svg{ - width: 3.5vw; + width: 2.5vw; margin: 0 5px; } } diff --git a/resources/sass/front/header.scss b/resources/sass/front/header.scss index 0211293..1df4c77 100644 --- a/resources/sass/front/header.scss +++ b/resources/sass/front/header.scss @@ -34,7 +34,10 @@ header{ background-color: rgba(255, 255, 255, .9); z-index: 2; - &.active{left: 0;} + &.active{ + left: 0; + text-align: center; + } ul{ flex-direction: column; align-items: center; @@ -189,6 +192,7 @@ header{ border-radius: 50%; span{ + display: contents; font-family: "Barlow Bold", Arial, Helvetica, sans-serif; color: $secondary; } diff --git a/resources/views/front/basic/end.blade.php b/resources/views/front/basic/end.blade.php index 58bc7df..d37690b 100644 --- a/resources/views/front/basic/end.blade.php +++ b/resources/views/front/basic/end.blade.php @@ -3,6 +3,11 @@ @section('title', 'Fin du jeu') @section('content') -

Date début : {{$settings->start_date}}, date de fin : {{$settings->end_date}} et la société : {{$settingsGlobal->company}}

-

Page de redirection : {{$settings->redirect_close}}

+
+
+
+

Fin du jeu

+

Le jeu est terminé !
Merci à tous pour votre participation !

+
+
@endsection diff --git a/resources/views/front/basic/home.blade.php b/resources/views/front/basic/home.blade.php index 15d9350..114b84c 100644 --- a/resources/views/front/basic/home.blade.php +++ b/resources/views/front/basic/home.blade.php @@ -37,7 +37,7 @@
20
-

Balances
culinaires Téfal

+

Balances
culinaires Tefal

Balance culinaire Téfal
@@ -117,7 +117,7 @@
-

La balance culinaire Téfal

+

La balance culinaire Tefal

Plus de place dans vos placards de cuisine ? La balance culinaire numérique pliable TEFAL est là pour vous ! Compacte, ultra pratique, intelligente et précise, elle sera votre alliée pour réussir toutes vos recettes !

diff --git a/resources/views/front/basic/login.blade.php b/resources/views/front/basic/login.blade.php index e1a1715..cb48507 100644 --- a/resources/views/front/basic/login.blade.php +++ b/resources/views/front/basic/login.blade.php @@ -17,7 +17,7 @@ @endif @if (session('success'))
- {!! session('success') !!} +

{!! session('success') !!}

@endif
@@ -36,7 +36,7 @@ @csrf
- +

Mot de passe oublié ?

 * Champs obligatoires
diff --git a/resources/views/front/basic/partials/footer.blade.php b/resources/views/front/basic/partials/footer.blade.php index 5f6d15c..7de42fe 100644 --- a/resources/views/front/basic/partials/footer.blade.php +++ b/resources/views/front/basic/partials/footer.blade.php @@ -8,8 +8,23 @@