fix(bugfixes): fix some small issues in modules

onyourmarks-agency · Sep 11, 2024 · d4ee93a · d4ee93a
1 parent 3f619b2
commit d4ee93a
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 14 deletions.
diff --git a/assets/css/3-base/forms.scss b/assets/css/3-base/forms.scss
@@ -6,6 +6,7 @@
   --input-background-color-disabled: #{$color-gray-medium};
   --input-background-color-hover: rgb(205 216 232 / 0.8);
   --input-padding: 8px 12px;
+  --input-border-hover: 2px solid #{$color-black};
   --input-border: 2px solid #{$color-gray-dark};
   --input-border-disabled: 2px solid #{$color-gray-dark};
   --input-border-error: 2px solid #{$color-red};
@@ -14,7 +15,6 @@
   --input-outline-width-hover: 6px;
   --input-opacity-disabled: 0.7;
   --input-placeholder-color: #{rgba($color-base-font, 0.7)};
-  --input-hover-border: 2px solid #{$color-black};
   --input-margin: 0;
 }
 
@@ -67,7 +67,7 @@ textarea {
 
   &:focus,
   &:hover {
-    border: var(--input-hover-border);
+    border: var(--input-border-hover);
   }
 
   &:disabled {
@@ -80,7 +80,7 @@ textarea {
   &.form__error,
   &:user-invalid {
     border: var(--input-border-error);
-    background: var(--input-background-color-error);
+    background-color: var(--input-background-color-error);
   }
 }
 

diff --git a/assets/js/_types/global.d.ts b/assets/js/_types/global.d.ts
@@ -1,3 +1,5 @@
+import type { HeroSlider } from '@js/_types/hero-slider';
+
 export type BreakPointType = 'sm' | 'md' | 'lg' | 'xl' | 'hamburger';
 
 export interface BreakPointConfigInterface {
@@ -21,5 +23,6 @@ declare global {
 
   interface Window {
     Bouncer: any;
+    heroSlider: HeroSlider[];
   }
 }
diff --git a/assets/js/modules/formvalidation/config/config.ts b/assets/js/modules/formvalidation/config/config.ts
@@ -3,8 +3,8 @@
 import validationMessages from './validation-messages';
 
 export const formClassNames = {
-  fieldClass: 'form__error',
-  errorClass: 'form__input--error',
+  fieldClass: 'form__input--error',
+  errorClass: 'form__error',
 };
 
 export const bouncerDefaultConfig = {

diff --git a/assets/js/modules/hamburger/Hamburger.svelte b/assets/js/modules/hamburger/Hamburger.svelte
@@ -62,8 +62,8 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    width: 40px;
-    height: 40px;
+    width: $h-width;
+    height: $h-height;
     cursor: pointer;
   }
 

diff --git a/assets/js/translations/languages/en/formvalidation.ts b/assets/js/translations/languages/en/formvalidation.ts
@@ -17,8 +17,8 @@ export const formvalidation: TranslationMessage = {
   'formvalidation.patternmismatch.password': 'The password does not meet the requirements.',
   'formvalidation.patternmismatch.default': 'Use the correct format.',
 
-  'formvalidation.outofrange.over': 'Choose a value lower than {max}.',
-  'formvalidation.outoforange.under': 'Choose a value higher than {min}.',
+  'formvalidation.outofrange.over': 'Choose a value with a max of {max}.',
+  'formvalidation.outoforange.under': 'Choose a value higher or equal than {min}.',
 
   'formvalidation.wronglength.over':
     'Sorry. You have used too many characters. You are now using {length} characters and there is a maximum of {maxLength}.',

diff --git a/assets/js/translations/languages/en/hamburger.ts b/assets/js/translations/languages/en/hamburger.ts
@@ -1,6 +1,6 @@
 import { type TranslationMessage } from '@translations/languages';
 
-export const popup: TranslationMessage = {
+export const hamburger: TranslationMessage = {
   'popup.hamburger.a11y.close': 'Open navigation',
   'popup.hamburger.a11y.open': 'Close navigation',
 };
diff --git a/assets/js/translations/languages/en/index.ts b/assets/js/translations/languages/en/index.ts
@@ -1,8 +1,10 @@
 import { type TranslationDomain } from '@translations/languages';
 import { formvalidation } from './formvalidation';
+import { hamburger } from './hamburger';
 import { popup } from './popup';
 
 export default {
   formvalidation,
+  hamburger,
   popup,
 } as TranslationDomain;
diff --git a/assets/js/translations/languages/nl/formvalidation.ts b/assets/js/translations/languages/nl/formvalidation.ts
@@ -17,8 +17,8 @@ export const formvalidation: TranslationMessage = {
   'formvalidation.patternmismatch.password': 'Het wachtwoord voldoet niet aan de eisen.',
   'formvalidation.patternmismatch.default': 'Gebruik het juiste format.',
 
-  'formvalidation.outofrange.over': 'Kies een waarde lager dan {max}.',
-  'formvalidation.outoforange.under': 'Kies een waarde hoger dan {min}.',
+  'formvalidation.outofrange.over': 'Kies een waarde met een maximum van {max}.',
+  'formvalidation.outoforange.under': 'Kies een waarde met een mimimum van {min}.',
 
   'formvalidation.wronglength.over':
     'Sorry. Je hebt teveel karakters gebruikt. Je gebruikt nu {length} karakters en er is een maximum van {maxLength}.',

diff --git a/assets/js/translations/languages/nl/hamburger.ts b/assets/js/translations/languages/nl/hamburger.ts
@@ -1,6 +1,6 @@
 import { type TranslationMessage } from '@translations/languages';
 
-export const popup: TranslationMessage = {
+export const hamburger: TranslationMessage = {
   'popup.hamburger.a11y.close': 'Open navigatie',
   'popup.hamburger.a11y.open': 'Sluit navigatie',
 };
diff --git a/assets/js/translations/languages/nl/index.ts b/assets/js/translations/languages/nl/index.ts
@@ -1,8 +1,10 @@
 import { type TranslationDomain } from '@translations/languages';
 import { formvalidation } from './formvalidation';
+import { hamburger } from './hamburger';
 import { popup } from './popup';
 
 export default {
   formvalidation,
+  hamburger,
   popup,
 } as TranslationDomain;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@onyourmarks/webpack-boilerplate",
-	"version": "6.6.0",
+	"version": "6.7.0",
 	"main": "app.ts",
 	"license": "MIT",
 	"config": {