Merge pull request #17 from GlideRide-online/patch-01

added more styling
GlideRide-online · Dec 12, 2023 · 4c0f4e8 · 4c0f4e8
2 parents 35241fb + d22afa5
commit 4c0f4e8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/client/src/Steps/Service.jsx b/client/src/Steps/Service.jsx
@@ -35,6 +35,8 @@ const Service = () => {
       duration: 8,
     },
   ];
+
+  console.log(localStorage.getItem("ShowUi"));
   const handleServiceSelect = (service) => {
     setSelectedService(service);
     fetch({ type: "UPDATE_STEP1", payload: service });

diff --git a/client/src/componetnts/Navbar.jsx b/client/src/componetnts/Navbar.jsx
@@ -15,7 +15,7 @@ const Navbar = () => {
     padding: "8px 16px",
     margin: "0 10px",
     transition: "background-color 0.3s",
-    fontFamily: "Pacifico, cursive", // Font family (use your chosen font)
+    // Font family (use your chosen font)
   };
 
   const buttonHoverStyle = {
@@ -44,10 +44,10 @@ const Navbar = () => {
           </>
         ) : (
           <>
-            <div className="text-center">
+            <div className="text-center font-roboto">
               <a href="https://glideride.online">
                 <button
-                  className="hover:bg-blue-500 font-roboto"
+                  className="font-roboto hover:bg-blue-500"
                   style={{ ...buttonStyle }}
                   onMouseEnter={(e) => {
                     e.target.style.backgroundColor =

diff --git a/client/src/componetnts/StepperControl.jsx b/client/src/componetnts/StepperControl.jsx
@@ -10,7 +10,7 @@ const StepperControl = ({ handleClick, steps, currentStep }) => {
         {/* back button */}
         <button
           onClick={() => handleClick()}
-          className={`bg-white text-slate-400 uppercase py-2 px-4
+          className={`bg-white font-roboto text-slate-400 uppercase py-2 px-4
 rounded-xl  cursor-pointer border-2 border-slate-
 hover:bg-black hover:text-white transition duration-200
 ease-in-out ${currentStep === 1 ? "opcity-50 cursor-not-allowed" : ""}`}
@@ -22,7 +22,7 @@ ease-in-out ${currentStep === 1 ? "opcity-50 cursor-not-allowed" : ""}`}
         {/* next button */}
         <button
           onClick={() => handleClick("next")}
-          className="bg-yellow-400 Itext-white uppercase py-2 px-4
+          className="bg-yellow-400 font-roboto Itext-white uppercase py-2 px-4
 rounded-xl font-semibold cursor-pointer hover:bg-black
 hover:text-white transition duration-200 ease-in-out"
           style={textStyle}

diff --git a/client/src/pages/Booking.jsx b/client/src/pages/Booking.jsx
@@ -80,8 +80,10 @@ const Booking = ({ showUi }) => {
                       onMouseEnter={() => setIsHovered(true)}
                       onMouseLeave={() => setIsHovered(false)}
                     >
-                      <i className="font-robot fab fa-google mr-2"></i> Proceed
-                      with Google
+                      <span className="font-roboto">
+                        <i className="fab fa-google mr-2"></i> Proceed with
+                        Google
+                      </span>
                     </button>
                   </div>
                 </div>