adapting the SportEvent.css to develop version

MatejFrnka · Feb 7, 2024 · 6c1621c · 6c1621c
1 parent c064bc1
commit 6c1621c
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/frontend/sportsmatch-app/src/styles/SportEvent.css b/frontend/sportsmatch-app/src/styles/SportEvent.css
@@ -16,26 +16,10 @@ body {
 
 .event .col.left {
   display: flex;
-<<<<<<< HEAD
-  justify-content: center;
-  margin-top: 5%;
-
-}
-.event-card {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    min-width: 361px;
-    min-height: 106px;
-    margin: 16px;
-    font-size: 10px;
-    box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.05);
-    border-radius: 2px;
-=======
   flex-direction: column;
   justify-content: flex-end;
   border-top-left-radius: 0.125em;
   border-bottom-left-radius: 0.125em;
->>>>>>> develop
 }
 
 .event .col.right {