Changeset 07f4e8b for frontend/src/Components/TransportDetails/Waypoint.js

Timestamp:

01/24/24 17:42:28 (5 months ago)

Author:

darsov2 <62809499+darsov2@…>

Branches:

master

Children:

0f5aa27

Parents:

5528b99

Message:

prefinal fixes

File:

• frontend/src/Components/TransportDetails/Waypoint.js (modified) (2 diffs)

frontend/src/Components/TransportDetails/Waypoint.js

@@ -16 +16 @@
     }
 
-<<<<<<< HEAD
     return (
         <>
@@ -58 +57 @@
         </>
     );
-=======
-  return (
-    <>
-      <Row className="d-flex flex-row gap-0">
-      {props.left === "true" && <Col className="d-flex flex-column justify-content-center col-auto" style={{paddingLeft: "2.6rem"}}>
-            <h5 style={{color: props.routes === "true" ? "white" : "" }} className="m-auto">{getTimeAsString(props.time)}</h5>
-        </Col>}
-        <Col md="auto">
-          <RxDot size={"4rem"} color="#159895"></RxDot>
-        </Col>
-        <Col className="d-flex flex-column justify-content-center">
-          <h3 className="my-auto" style={{...style, fontSize: props.routes === "true" ? "1.3rem" : "", color: props.routes === "true" ? "#708090        " : ""}}>{props.city}</h3>
-        </Col>
-      {props.left !== "true" && <Col className="d-flex flex-column justify-content-center">
-            <h5>{getTimeAsString(props.time)}</h5>
-        </Col>}
-      </Row>
-      <Row>
-      <Line left={props.left}> </Line>
-      </Row>
-    </>
-  );
->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl)
 };