Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit into straight-underline-no-curvy_michael

# Conflicts:
#	src/components/AuthPages/Login/index.jsx

.vscode/settings.json

@@ -8,7 +8,7 @@
   },
   "[javascriptreact]": {
     "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": null
   },
   "javascript.validate.enable": false, //disable all built-in syntax checking
   "editor.codeActionsOnSave": {

src/assets/images/shape/title-shape.svg

@@ -1,5 +1,5 @@
 <svg width="174" height="31" viewBox="0 0 174 31" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 17.9998C10.5 7.5 56.6856 24.9909 78 28C120.5 34 162 24 173 1" stroke="url(#paint0_linear_4_1797)" stroke-width="2" stroke-linecap="round"/>
+<path d="M0,0 173,0" stroke="url(#paint0_linear_4_1797)" stroke-width="4" stroke-linecap="round"/>
 <defs>
 <linearGradient id="paint0_linear_4_1797" x1="1" y1="1" x2="11.0515" y2="59.9411" gradientUnits="userSpaceOnUse">
 <stop stop-color="#F539F8"/>
@@ -8,3 +8,14 @@
 </linearGradient>
 </defs>
 </svg>
+
+<!-- <svg width="174" height="31" viewBox="0 0 174 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 17.9998C10.5 7.5 56.6856 24.9909 78 28C120.5 34 162 24 173 1" stroke="url(#paint0_linear_4_1797)" stroke-width="2" stroke-linecap="round"/>
+<defs>
+<linearGradient id="paint0_linear_4_1797" x1="1" y1="1" x2="11.0515" y2="59.9411" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F539F8"/>
+<stop offset="0.416763" stop-color="#C342F9"/>
+<stop offset="1" stop-color="#5356FB"/>
+</linearGradient>
+</defs>
+</svg> -->

src/components/Settings/index.jsx

@@ -95,7 +95,7 @@ export default function Settings() {
             <div className="content-container w-full pt-10 rounded-2xl bg-white dark:bg-dark-white  ">
               <div className="content-heading w-full mb-8 lg:px-10 px-4">
                 <h1 className="text-xl font-bold text-dark-gray dark:text-white antialiased">
-                  Personal Information
+                  Parsonal Informaiton
                 </h1>
               </div>
               <div className="content-body w-full lg:flex lg:px-10 px-4">
@@ -144,7 +144,7 @@ export default function Settings() {
                       </div>
                       <div>
                         <p className="text-18 tracking-wide">
-                          Notification Settings
+                          Notifiction Setting
                         </p>
                       </div>
                     </li>

tailwind.config.js

@@ -19,9 +19,6 @@ module.exports = {
         "dark-light-purple":"#5356fb29"
       },
     },
-    listStyleType: {
-      roman: 'upper-roman'
-    },
   },
   plugins: [require("@tailwindcss/line-clamp")],
 };