From 5114700f4df75d4b619fde0b48fb79df05d545c1 Mon Sep 17 00:00:00 2001
From: Luke <log_luke@icloud.com>
Date: Thu, 16 Jul 2020 22:41:28 +0200
Subject: [PATCH] Fix taximeter styling

---
 .../assets/css/taximeter/main.css                   | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/ReallifeGamemode.Client/assets/css/taximeter/main.css b/ReallifeGamemode.Client/assets/css/taximeter/main.css
index 0cf4a56a..78269555 100644
--- a/ReallifeGamemode.Client/assets/css/taximeter/main.css
+++ b/ReallifeGamemode.Client/assets/css/taximeter/main.css
@@ -6,18 +6,11 @@
 }
 
 body {
-<<<<<<< HEAD
-    width: 240px; 
-    position: absolute;
-    bottom: 2%;
-    right: 2%;
-=======
     width: 275px;
 
     position: absolute;
     right: 0;
     bottom: 0
->>>>>>> d5315eb4bf0834bfa3f1c68e2e67a0e379b9ef70
 }
 
 h4 {
@@ -40,11 +33,7 @@ h4 {
 
 .taximeter {
     max-width: 100%;
-<<<<<<< HEAD
-    height: 60px;
-=======
     height: fit-content;
->>>>>>> d5315eb4bf0834bfa3f1c68e2e67a0e379b9ef70
     padding: 1em;
     display: flex;
     justify-content: space-between;
@@ -78,7 +67,7 @@ h4 {
     max-width: 100%;
     margin: 0;
     font-family: DS-Digital;
-    font-size: 120%;
+    font-size: 150%;
     color: red;
     display: block
 }