Merge branch 'main' of github.com:ging/fun4date

ging · Jun 14, 2024 · c9e11bd · c9e11bd
2 parents 8bdbe61 + 6dee9d1
commit c9e11bd
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 22 deletions.
diff --git a/app/i18n.js b/app/i18n.js
@@ -16,19 +16,24 @@ i18n
   // for all options read: https://www.i18next.com/overview/configuration-options
   .init({
     debug: true,
-    fallbackLng: 'en',
+    fallbackLng: 'en', // Set the fallback language to English
+    resources: {
+      en: {
+        translation: en
+      },
+      es: {
+        translation: es
+      }
+    },
     interpolation: {
       escapeValue: false, // not needed for react as it escapes by default
     },
-    resources: {}});
-
-    i18n.addResourceBundle('en', 'translation', {
-        ...en
-    });
-    i18n.addResourceBundle('es', 'translation', {
-        ...es
-    });
-
-
+    detection: {
+      // order and from where user language should be detected
+      order: ['localStorage', 'navigator'],
+      // keys or params to lookup language from
+      lookupLocalStorage: 'i18nextLng',
+    }
+  });
 
-export default i18n;
+export default i18n;
diff --git a/app/sass/lib/_variables.sass b/app/sass/lib/_variables.sass
@@ -5,8 +5,14 @@ $orange_accent: #98CE00
 $burgundry_support: #9f226d
 $cyan_support: #21e2ed
 $lilac_support: #ae9ff2
-$black: #333333
+$black: #272932
+// text and bg main
+$text-main: #F8F8F8
+$background: #272932
+
+//hay que borrar las variables ca-blue, las he dejado para que no haya errores de variables que no existen por ahora
 // blues
+//NO USAR ESTOS
 $ca-blue-900: #1C74D9
 $ca-blue-800: #1C74D9
 $ca-blue-700: #1C74D9
@@ -17,10 +23,26 @@ $ca-blue-300: #becaff
 $ca-blue-200: #dbe2ff
 $ca-blue-100: #ebf0ff
 $ca-blue-50: #f5f8ff
-//oranges
-$ca-or-300: #98CE00
-$ca-or-200: #98CE00
-$ca-or-100: #98CE00
+
+$ca-or-300: #FF9900
+$ca-or-200: #FFBD1B
+$ca-or-100: #FFE685
+
+//NO USAR ESTOS
+
+//USAR ESTOS
+$ffd-blue-500: #3D8EEA
+$ffd-blue-500: #9ECBFF
+$ffd-blue-500: #C9E2FF
+$ffd-blue-500: #E8F2FF
+$ffd-blue-500: #F9FCFF
+//USAR ESTOS
+
+//green
+$ffd-green-400: #D7F38A
+$ffd-green-300: #F1FFCA
+
+
 
 //MEDIA QUERIES
 //ES

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -15,11 +15,15 @@ module.exports = {
       colors: {
         primary: "#5441FF",
         accent: "#5340FF",
-        black: "#100025",
+        black: "#272932",
         white: "#FAFBFF",
         burgundy: "#9F226D",
         cyan: "#21E2ED",
         lilac: "#AE9FF2",
+        bluePrimary:'#1C74D9',
+        greenPrimary:'#98CE00',
+        //borrar ca_blue, ca_orange cuando ya no estén usándose en ningún componente
+        //borrar
         ca_blue: {
           900: "#3302BF",
           800: "#4507C9",
@@ -37,12 +41,27 @@ module.exports = {
           200: "FFBD1B",
           100: "FFE685",
         },
+        //borrar
 
         gray: {
-          400: "#383649",
-          300: "#706C93",
-          200: "#B5B2CC",
-          100: "#E9E8F0",
+          600:'#393D49',
+          500:'#606578',
+          400:'#B4B7C2',
+          300:'#DEE0EA',
+          200:'#F1F3FA',
+          100:'#F8F8F8',
+
+        },
+        ffdGreen:{
+          400:'#D7F38A',
+          300: '#F1FFCA',
+        },
+        ffdBlue:{
+          500:'#3D8EEA',
+          400: '#9ECBFF',
+          300: '#C9E2FF',
+          200: '#E8F2FF',
+          100: '#F9FCFF'
         },
       },
     },