Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added more styling #17

Merged
merged 1 commit into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions client/src/Steps/Service.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ const Service = () => {
duration: 8,
},
];

console.log(localStorage.getItem("ShowUi"));
const handleServiceSelect = (service) => {
setSelectedService(service);
fetch({ type: "UPDATE_STEP1", payload: service });
Expand Down
6 changes: 3 additions & 3 deletions client/src/componetnts/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 =
Expand Down
4 changes: 2 additions & 2 deletions client/src/componetnts/StepperControl.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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" : ""}`}
Expand All @@ -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}
Expand Down
6 changes: 4 additions & 2 deletions client/src/pages/Booking.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down