resolve merge conflicts and fix styling

cornell-dti · Oct 13, 2024 · ac880ff · ac880ff
1 parent 11f9e76
commit ac880ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/frontend/src/components/RideModal/Pages/RideTimes.tsx b/frontend/src/components/RideModal/Pages/RideTimes.tsx
@@ -185,7 +185,6 @@ const RideTimesPage: React.FC<RideTimesProps> = ({
               Date
             </Label>
             <Input
-              className={styles.input}
               id="date"
               type="date"
               {...register('date', {
@@ -237,7 +236,6 @@ const RideTimesPage: React.FC<RideTimesProps> = ({
               Pickup time:
             </Label>
             <Input
-              className={styles.input}
               id="pickupTime"
               type="time"
               className={cn(styles.timeStyle)}
@@ -263,7 +261,6 @@ const RideTimesPage: React.FC<RideTimesProps> = ({
               Dropoff time:
             </Label>
             <Input
-              className={styles.input}
               id="dropoffTime"
               type="time"
               className={cn(styles.timeStyle)}

diff --git a/frontend/src/components/RideModal/ridemodal.module.css b/frontend/src/components/RideModal/ridemodal.module.css
@@ -173,9 +173,9 @@
   border-radius: 4px;
   cursor: pointer;
   transition: all 0.2s ease;
-  background-color: #000;
+  /* background-color: #000;
   color: #fff;
-  border: none;
+  border: none; */
 }
 
 .btnContainer button:hover {
@@ -215,6 +215,8 @@
   .btnContainer button {
     width: 100%;
   }
+}
+
 .nameInput {
   font-size: 1.5rem;
   width: 100%;