From e3d155394da06ce5c8f95fd1f1bca53133e8194e Mon Sep 17 00:00:00 2001
From: Alexis Gousseau <alexis.gousseau@ldc.fr>
Date: Mon, 19 Jun 2023 11:01:30 +0200
Subject: [PATCH] fix word-counter input/textarea style

---
 resources/sass/base/_custom.scss                 |  4 +---
 .../ts/components/InputTextAutoComponent.vue     |  2 +-
 resources/ts/components/WordCounterComponent.vue |  8 ++++++++
 resources/views/login.blade.php                  | 16 ++++++++--------
 .../views/partials/inputs/varchar.blade.php      |  2 +-
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/resources/sass/base/_custom.scss b/resources/sass/base/_custom.scss
index c71d34e..2fcdac3 100644
--- a/resources/sass/base/_custom.scss
+++ b/resources/sass/base/_custom.scss
@@ -1,3 +1 @@
-.need-word-counter {
-    border-radius: 0 0 0.375rem 0.375rem !important;
-}
+// empty.
diff --git a/resources/ts/components/InputTextAutoComponent.vue b/resources/ts/components/InputTextAutoComponent.vue
index a374eca..0ae3f2b 100644
--- a/resources/ts/components/InputTextAutoComponent.vue
+++ b/resources/ts/components/InputTextAutoComponent.vue
@@ -7,7 +7,7 @@
     <textarea
       ref="textarea"
       :id="intId"
-      :class="`input-text-auto-component-input need-word-counter ${intClass}`"
+      :class="`input-text-auto-component-input ${intClass}`"
       :name="intName"
       :aria-describedby="intAriaDescribedby"
       :placeholder="intPlaceholder"
diff --git a/resources/ts/components/WordCounterComponent.vue b/resources/ts/components/WordCounterComponent.vue
index 7115de7..b6e834d 100644
--- a/resources/ts/components/WordCounterComponent.vue
+++ b/resources/ts/components/WordCounterComponent.vue
@@ -108,6 +108,14 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+#word-counter + input[type="text"],
+.word-counter + input[type="text"],
+#word-counter + textarea,
+.word-counter + textarea,
+#word-counter-varchar + textarea,
+.word-counter-varchar + textarea  {
+  border-radius: 0 0 0.375rem 0.375rem;
+}
 .word-counter-varchar {
   color: initial;
   border: 1px solid rgb(196, 196, 196);
diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php
index 1c3d682..b3b981d 100644
--- a/resources/views/login.blade.php
+++ b/resources/views/login.blade.php
@@ -4,23 +4,23 @@
 <div class="login text-center">
     <form class="form-signin" method="POST" action="{{ route('authenticate') }}">
         @csrf
-        <img class="mb-4" src="{{ asset('assets/images/logo_ldc.png') }}" alt="LDC Services">
-        <h1 class="h3 mb-3 font-weight-normal">LDC CRM</h1>
+        <img class="mb-4" src="{{ asset('assets/images/logo_ldc.png') }}" alt="{{ __('LDC Services') }}">
+        <h1 class="h3 mb-3 font-weight-normal">{{ __('LDC CRM') }}</h1>
         @if ($errors->any())
-            <div class="alert alert-danger">
-                <ul>
+            <div class="alert alert-danger my-2">
+                <ul class="list-group list-unstyled">
                     @foreach ($errors->all() as $error)
                         <li>{!! $error !!}</li>
                     @endforeach
                 </ul>
             </div>
         @endif
-        <label for="inputEmail" class="visually-hidden">Adresse email</label>
+        <label for="inputEmail" class="visually-hidden">{{ __('Adresse email') }}</label>
         <input type="email" id="inputEmail" class="form-control" placeholder="Adresse email" name="email" value="{{ old('email') }}" required autofocus>
-        <label for="inputPassword" class="visually-hidden">Mot de passe</label>
+        <label for="inputPassword" class="visually-hidden">{{ __('Mot de passe') }}</label>
         <input type="password" id="inputPassword" class="form-control" placeholder="Mot de passe" name="password" required>
-        <button class="btn btn-lg btn-primary btn-block" type="submit">Connexion</button>
-        <p class="mt-5 mb-3 text-muted">&copy; LDC Services {{ date('Y') }}</p>
+        <button class="btn btn-lg btn-primary btn-block" type="submit">{{ __('Connexion') }}</button>
+        <p class="mt-5 mb-3 text-muted">&copy; {{ __('LDC Services') }} {{ date('Y') }}</p>
     </form>
 </div>
 @endsection
diff --git a/resources/views/partials/inputs/varchar.blade.php b/resources/views/partials/inputs/varchar.blade.php
index 48db71c..a0e6fed 100644
--- a/resources/views/partials/inputs/varchar.blade.php
+++ b/resources/views/partials/inputs/varchar.blade.php
@@ -6,7 +6,7 @@
 @if(!empty($hasWordCounter ?? false))
 <div class="word-counter" data-json='@json(['id' => $id])'></div>
 @endif
-<input name="{{ $name }}" type="text" value="{{ old($name, $model->{$name} ?? '') }}" class="form-control need-word-counter @error($name) is-invalid @enderror"
+<input name="{{ $name }}" type="text" value="{{ old($name, $model->{$name} ?? '') }}" class="form-control @error($name) is-invalid @enderror"
     id="{{ $id }}"
     aria-describedby="{{ $id }}Help"
     placeholder="{{ $placeholder ?? __('Un nom beau et explicite') }}"