diff --git a/resources/sass/_page.scss b/resources/sass/_page.scss index 9bf31ec..72e799f 100644 --- a/resources/sass/_page.scss +++ b/resources/sass/_page.scss @@ -47,7 +47,7 @@ .cover { max-width: 384px; - @include media-breakpoint-down(xl) { + @include media-breakpoint-down(lg) { order: 1; margin: 0 auto; max-width: 253px; @@ -148,11 +148,6 @@ padding: 32px !important; } } - input { - @include media-breakpoint-down(sm) { - background-color: $clearblue; - } - } .forgot-pwd { text-align: left; margin: 0; diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss index 4b89bff..9dc8629 100644 --- a/resources/sass/_variables.scss +++ b/resources/sass/_variables.scss @@ -28,7 +28,7 @@ $colors: ( ); $grid-breakpoints: ( - xs: 0, + xs: 1px, sm: 576px, md: 768px, lg: 992px, @@ -37,9 +37,9 @@ $grid-breakpoints: ( ); $container-max-widths: ( - sm: 100%, - md: 720px, - lg: 960px, + sm: calc(1280px + 32px), + md: calc(1280px + 32px), + lg: calc(1280px + 32px), xl: calc(1280px + 32px), // 32px est la largeur de la gouttiÃ¨re xxl: calc(1280px + 32px) ); diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 0ddb763..1c77a78 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -2,9 +2,10 @@ @import "common"; @import '~bootstrap/scss/bootstrap'; +@import "tailwindcss"; @import 'mixins'; @import "ais"; -@import "fonts"; +//@import "fonts"; @import "colors"; @import "nav"; @import "footer"; @@ -296,10 +297,22 @@ article { } } +.d-flex { + display: flex; +} + +.justify-content-between { + justify-content: space-between; +} + +.align-items-center { + align-items: center; +} + .flex--center { - @extend .d-flex; - @extend .justify-content-center; - @extend .align-items-center; + display: flex; + justify-content: center; + align-items: center; } .circlebutton { @@ -361,10 +374,6 @@ article { transition: all .3s; @include media-breakpoint-up(lg) { font-weight: 500; - font-size: 12px; - } - @include media-breakpoint-up(xl) { - font-size: 16px; } } @@ -398,6 +407,8 @@ article { .container { padding-right: 16px; padding-left: 16px; + max-width: calc(1280px + 32px); + width: 100%; } .bigtitle { @@ -575,6 +586,16 @@ article { } } +.form-group { + position: relative; + .invalid-feedback { + position: absolute; + top: 6px; + right: 0; + text-align: right; + } +} + $fs : (16,20,25); @each $fs in $fs { diff --git a/resources/views/account/index.blade.php b/resources/views/account/index.blade.php index 2996b32..0553a74 100644 --- a/resources/views/account/index.blade.php +++ b/resources/views/account/index.blade.php @@ -2,8 +2,8 @@ @section('content')

@if(! $user->reg_complete)

Merci de remplir ce formulaire pour finaliser la crÃ©ation de votre compte afin de pouvoir accÃ©der aux contenus Prescription SantÃ©. @@ -40,7 +40,7 @@

@endif -

@csrf

@@ -49,10 +49,10 @@ -

- {{ __('PrÃ©nom') }} +

+ {{ __('PrÃ©nom') }} -

@error('first_name') @@ -63,10 +63,10 @@

- {{ __('Nom') }} +

+ {{ __('Nom') }} -

@error('last_name') @@ -78,10 +78,10 @@

- {{ __('Adresse email') }} +

+ {{ __('Adresse email') }} -

@error('email') @@ -92,10 +92,10 @@

- {{ __('TÃ©lÃ©phone') }} +

+ {{ __('TÃ©lÃ©phone') }} -

@error('phone') @@ -105,10 +105,10 @@ @enderror

- {{ __('Employeur') }} +

+ {{ __('Employeur') }} -

@if($user->organization === null) @error('employer') @@ -118,15 +118,14 @@ @enderror @else - @endif

- {{ __('Adresse') }} +

+ {{ __('Adresse') }} -

@error('address') @@ -140,10 +139,10 @@

- {{ __('Service') }} +

+ {{ __('Service') }} -

@error('service') @@ -153,10 +152,10 @@ @enderror

- {{ __('Fonction') }} +

+ {{ __('Fonction') }} -

@error('fonction') @@ -166,8 +165,8 @@ @enderror

accepts_polls) ? 'checked' : ''}}> @@ -178,8 +177,8 @@

wants_pdf) ? 'checked' : ''}}> @@ -194,10 +193,10 @@ @if(! $user->reg_complete) -

- {{ __('Nouveau mot de passe') }} +

+ {{ __('Nouveau mot de passe') }} -

reg_complete ? '' : 'required'}} autocomplete="new-password"> @error('password') @@ -208,18 +207,18 @@

- {{ __('Confirmation mot de passe') }} +

+ {{ __('Confirmation mot de passe') }} -

reg_complete ? '' : 'required'}} autocomplete="new-password">

@endif -

@@ -229,16 +228,16 @@

@if($user->reg_complete) -

@csrf

Modifier mon mot de passe

- {{ __('Nouveau mot de passe') }} +

+ {{ __('Nouveau mot de passe') }} -

reg_complete ? '' : 'required'}} autocomplete="new-password"> @error('password') @@ -249,16 +248,16 @@

- {{ __('Confirmation mot de passe') }} +

+ {{ __('Confirmation mot de passe') }} -

reg_complete ? '' : 'required'}} autocomplete="new-password">

diff --git a/resources/views/admin/settings/strings.blade.php b/resources/views/admin/settings/strings.blade.php index cc75a2b..4fc04ed 100644 --- a/resources/views/admin/settings/strings.blade.php +++ b/resources/views/admin/settings/strings.blade.php @@ -62,13 +62,20 @@ ]) @formField('input', [ - 'label' => 'Titre bloc image accueil', + 'label' => 'Titre bloc image - accueil', 'name' => 'title_bloc_image_home', 'maxlength' => 1000, 'required' => true, 'toolbarOptions' => \App\Helpers\Fields::fullToolbar(), ]) + @formField('input', [ + 'label' => 'Sous-titre bloc image - accueil', + 'name' => 'subtitle_bloc_image_home', + 'maxlength' => 1000, + 'required' => true, + ]) + @formField('wysiwyg', [ 'label' => 'Texte bloc image accueil', 'name' => 'text_bloc_image_home', @@ -118,8 +125,16 @@ ]) @formField('wysiwyg', [ - 'label' => 'Texte - page abonnement', - 'name' => 'text_subscription', + 'label' => 'Texte 1 - page abonnement', + 'name' => 'text_1_subscription', + 'maxlength' => 1000, + 'required' => true, + 'toolbarOptions' => \App\Helpers\Fields::fullToolbar(), + ]) + + @formField('wysiwyg', [ + 'label' => 'Texte 2 - page abonnement', + 'name' => 'text_2_subscription', 'maxlength' => 1000, 'required' => true, 'toolbarOptions' => \App\Helpers\Fields::fullToolbar(), @@ -157,12 +172,26 @@ 'toolbarOptions' => \App\Helpers\Fields::fullToolbar(), ]) + @formField('input', [ + 'label' => 'Nom', + 'name' => 'form_lastname', + 'maxlength' => 1000, + 'required' => true, + ]) + + @formField('input', [ + 'label' => 'PrÃ©nom', + 'name' => 'form_firstname', + 'maxlength' => 1000, + 'required' => true, + 'toolbarOptions' => \App\Helpers\Fields::fullToolbar(), + ]) + @formField('input', [ 'label' => 'Nom complet', 'name' => 'form_fullname', 'maxlength' => 1000, 'required' => true, - 'toolbarOptions' => \App\Helpers\Fields::fullToolbar(), ]) @formField('input', [ @@ -171,7 +200,6 @@ 'maxlength' => 1000, 'type' => 'email', 'required' => true, - 'toolbarOptions' => \App\Helpers\Fields::fullToolbar(), ]) @formField('input', [ @@ -206,6 +234,14 @@ 'toolbarOptions' => \App\Helpers\Fields::fullToolbar(), ]) + @formField('input', [ + 'label' => 'Sous-titre - page annonceurs', + 'name' => 'subtitle_announcers', + 'maxlength' => 1000, + 'required' => true, + 'toolbarOptions' => \App\Helpers\Fields::fullToolbar(), + ]) + @formField('wysiwyg', [ 'label' => 'Texte - page annonceurs', 'name' => 'text_announcers', @@ -278,6 +314,13 @@ 'toolbarOptions' => \App\Helpers\Fields::fullToolbar(), ]) + @formField('input', [ + 'label' => 'Sous-titre brochure - page annonceurs', + 'name' => 'subtitle_2_brochure', + 'maxlength' => 1000, + 'required' => true + ]) + @formField('wysiwyg', [ 'label' => 'Titre intro formulaire - page annonceur', 'name' => 'form_intro_title_announcers', @@ -310,6 +353,13 @@ 'toolbarOptions' => \App\Helpers\Fields::fullToolbar(), ]) + @formField('input', [ + 'label' => 'PÃ©riode de diffusion', + 'name' => 'form_period', + 'maxlength' => 1000, + 'required' => true, + ]) +

Page contact

@formField('input', [ diff --git a/resources/views/annonceurs/index.blade.php b/resources/views/annonceurs/index.blade.php index 2adac48..d523e9d 100644 --- a/resources/views/annonceurs/index.blade.php +++ b/resources/views/annonceurs/index.blade.php @@ -7,7 +7,12 @@

{!! $settings->byKey('title_announcers') !!}

- {!! $settings->byKey('text_announcers') !!} +

+ {!! str_replace('\n', "
", $settings->byKey('subtitle_announcers')) !!} +

+ {!! $settings->byKey('text_announcers') !!} +

@@ -24,35 +29,36 @@

{!! $settings->byKey('title_brochure') !!}

{!! $settings->byKey('texte_brochure_1') !!}

{!! $settings->byKey('price_brochure_1') !!}

{!! $settings->byKey('texte_brochure_2') !!}

{!! $settings->byKey('price_brochure_2') !!}

{!! $settings->byKey('texte_brochure_3') !!}

{!! $settings->byKey('price_brochure_3') !!}

{!! $settings->byKey('subtitle_brochure') !!} +

{!! $settings->byKey('subtitle_2_brochure') !!}

@@ -121,7 +127,21 @@ {!! $settings->byKey('form_nbr_page') !!}

- + + + @error('page') + + {{ $message }} + + @enderror +

+ +

+ {!! $settings->byKey('form_period') !!} + +

+ @error('page') @@ -200,7 +220,7 @@ {{--

--}} {{--

--}}

*Champs obligatoires

diff --git a/resources/views/auth/discover/index.blade.php b/resources/views/auth/discover/index.blade.php index 633c083..76ad139 100644 --- a/resources/views/auth/discover/index.blade.php +++ b/resources/views/auth/discover/index.blade.php @@ -10,7 +10,7 @@

{!! $settings->byKey('main_title_discover_psq') !!}

{!! $settings->byKey('subtitle_discover_psq') !!}

@@ -29,7 +29,7 @@ @endif

- {!! $settings->byKey('form_fullname') !!} * + {!! $settings->byKey('form_lastname') !!} *

@@ -42,6 +42,20 @@

+ {!! $settings->byKey('form_firstname') !!} * + +

+ + + @error('first_name') + + {{ $message }} + + @enderror +

{!! $settings->byKey('form_email_pro') !!} * @@ -103,6 +117,8 @@

+ +

*Champs obligatoires

diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index a71bc0e..7a20b61 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -3,7 +3,7 @@ @section('content')

@@ -77,7 +77,7 @@

- + {!! $settings->byKey('form_not_register_btn') !!}

diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 1fea984..e8ea086 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -1,10 +1,10 @@ @extends('layouts.app') @section('content') -

@@ -17,10 +17,10 @@

@csrf -

- {{ __('E-Mail Address') }} +

+ {{ __('E-Mail Address') }} -

@error('email') @@ -31,10 +31,10 @@

diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 989931d..ab77dd2 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -2,9 +2,9 @@ @section('content')

@@ -13,10 +13,10 @@ -

- {{ __('E-Mail Address') }} +

+ {{ __('E-Mail Address') }} -

@error('email') @@ -27,10 +27,10 @@

- {{ __('Password') }} +

+ {{ __('Password') }} -

@error('password') @@ -42,16 +42,16 @@

- {{ __('Confirm Password') }} + {{ __('Confirm Password') }} -

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index e081121..3ef1767 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -2,7 +2,7 @@ @section('content')

@@ -16,7 +16,7 @@

@endif -

@@ -26,27 +26,28 @@ @if(request()->has('redirect_to')) @endif -

- {{ __('PrÃ©nom') }} -

- +

+ {{ __('Nom') }} - @error('first_name') - +

+ + + @error('last_name') + {{ $message }} @enderror

- {{ __('Nom') }} +

+ {{ __('PrÃ©nom') }} -

- +

+ - @error('last_name') + @error('first_name') {{ $message }} @@ -54,10 +55,10 @@

- {{ __('E-Mail Address') }} +

+ {{ __('E-Mail Address') }} -

@error('email') @@ -68,10 +69,10 @@

- {{ __('Employeur') }} +

+ {{ __('Employeur') }} -

@error('employer') @@ -84,10 +85,10 @@ -

- {{ __('Password') }} +

+ {{ __('Password') }} -

@error('password') @@ -98,15 +99,15 @@

- {{ __('Confirm Password') }} +

+ {{ __('Confirm Password') }} -

@@ -119,8 +120,8 @@

@error(recaptchaFieldName()) {{ $message }} @@ -130,9 +131,9 @@

diff --git a/resources/views/contact/index.blade.php b/resources/views/contact/index.blade.php index e4c7530..1025c2b 100644 --- a/resources/views/contact/index.blade.php +++ b/resources/views/contact/index.blade.php @@ -33,7 +33,7 @@

{!! $settings->byKey('title_contact') !!}

{!! $settings->byKey('subtitle_contact') !!}

{!! $settings->byKey('text_contact') !!}

@@ -97,7 +97,9 @@

- +

+ +

@@ -140,7 +142,7 @@ {{--

--}} {{--

--}}

*Champs obligatoires

diff --git a/resources/views/contact/subscription-request.blade.php b/resources/views/contact/subscription-request.blade.php index 8591e4e..6c8cac2 100644 --- a/resources/views/contact/subscription-request.blade.php +++ b/resources/views/contact/subscription-request.blade.php @@ -7,9 +7,12 @@

{!! $settings->byKey('main_title_subscription') !!}

{!! $settings->byKey('subtitle_subscription') !!}

- {!! $settings->byKey('text_subscription') !!} +

{!! $settings->byKey('text_1_subscription') !!}

+ {!! $settings->byKey('text_2_subscription') !!} +

@@ -157,7 +160,7 @@ {{--

--}} {{--

--}}

*Champs obligatoires

@@ -169,9 +172,3 @@ @endsection - diff --git a/resources/views/home/index.blade.php b/resources/views/home/index.blade.php index 9921e0d..905b6ce 100644 --- a/resources/views/home/index.blade.php +++ b/resources/views/home/index.blade.php @@ -2,41 +2,42 @@ @inject('settings', \A17\Twill\Repositories\SettingRepository::class) @section('content') -

- - @if(session()->has('message')) -

+ @if(session()->has('message')) +

{!! session('message') !!}

- @endif +

+ @endif - @if(session()->has('warning')) -

- {!! session('warning') !!} - -

- @endif + @if(session()->has('warning')) +

+ {!! session('warning') !!} + +

+ @endif - @if (session('resent')) -

- {{ __('A fresh verification link has been sent to your email address.') }} -

- @elseif(\Auth::check() && !\Auth::user()->hasVerifiedEmail()) -

- {{ __('Before proceeding, please check your email for a verification link.') }} - {{ __('If you did not receive the email') }}, - -

- @endif + @if (session('resent')) +

+ {{ __('A fresh verification link has been sent to your email address.') }} +

+ @elseif(\Auth::check() && !\Auth::user()->hasVerifiedEmail()) +

+ {{ __('Before proceeding, please check your email for a verification link.') }} + {{ __('If you did not receive the email') }}, + +

+ @endif +

@@ -61,7 +62,7 @@ @endforeach--}}

{!! $settings->byKey('title_discover_home') !!}

@@ -76,9 +77,9 @@

{!! $settings->byKey('title_last_edition') !!}

@foreach($last_pdf->slice(0, 7) as $key => $pdf) @@ -97,7 +98,7 @@ @endforeach

- +

{!! $settings->byKey('title_bloc_image_home') !!}

- {!! $settings->byKey('text_bloc_image_home') !!} +

{!! $settings->byKey('subtitle_bloc_image_home') !!}

+ {!! $settings->byKey('text_bloc_image_home') !!} +

{!! $settings->byKey('not_register_link') !!}

- Feuilleter un quotidien + Feuilleter un quotidien

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index e1d0ad8..772e235 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -4,6 +4,23 @@ + + + + @@ -15,7 +32,7 @@ @yield('scripts') - {!! ReCaptcha::htmlScriptTagJsApi() !!} + {!! htmlScriptTagJsApi() !!} @@ -61,7 +78,7 @@ @endif -

Page contact

{!! $settings->byKey('title_announcers') !!}

{!! $settings->byKey('main_title_discover_psq') !!}

{!! $settings->byKey('title_contact') !!}

{!! $settings->byKey('main_title_subscription') !!}

{!! $settings->byKey('title_discover_home') !!}

{!! $settings->byKey('title_last_edition') !!}

{!! $settings->byKey('title_bloc_image_home') !!}

{{ $settings->byKey('title_quotidien_home') }}