From 89d7c9c9d5692916e442e6470024f268269ab4bd Mon Sep 17 00:00:00 2001
From: Halfdan Mouritzen <halfdan@robothangarskib.dk>
Date: Sat, 2 Mar 2024 14:49:50 +0100
Subject: [PATCH] CSS should be merged correctly now

---
 src/project/static/css/style.css | 255 +------------------------------
 1 file changed, 4 insertions(+), 251 deletions(-)

diff --git a/src/project/static/css/style.css b/src/project/static/css/style.css
index 28df40c..5017698 100644
--- a/src/project/static/css/style.css
+++ b/src/project/static/css/style.css
@@ -47,19 +47,6 @@ h6 {
 /* Variables */
 :root {
   /* Colors */
-<<<<<<< HEAD
-  --light : #fff;
-  --light-dust : #f6f6f6;
-  --dust : #f1f1f1;
-  --medium-dust : #dadada;
-  --dark-dust : #bfbfbf;
-  --fade : #878787;
-  --twilight : #4a4a4a;
-  --dark : #2a2a2a;
-  --custard : #f0dcac;
-  --water : #a8f3f4;
-  --splash : #4b3aba;
-=======
   --light: #ffffff;
   --light-dust: #fefef9;
   --dust: #f4f1ef;
@@ -75,7 +62,6 @@ h6 {
   --dark-custard: #d4c7a9;
   --water: #a8f3f4;
   --splash: #4b3aba;
->>>>>>> cf3c84b8d9794013cb562c843e42314543b3d381
 
   /* Sizes */
   --space: 12px;
@@ -108,12 +94,7 @@ h6 {
 }
 
 a {
-<<<<<<< HEAD
-  font-weight : 500;
-  color : var(--splash);
-  text-decoration : none;
-=======
-  <<<<<<< HEAD font-weight: 500;
+  font-weight: 500;
   color: var(--splash);
   text-decoration: none;
   cursor: pointer;
@@ -124,11 +105,6 @@ hr {
   height: 0;
   border: 0;
   border-bottom: 1px solid var(--dark-custard);
-  =======font-weight: 500;
-  color: var(--splash);
-  text-decoration: none;
-  >>>>>>>bdc2d8717cbcab1795b1b2dc4f08f83242e4a4ca
->>>>>>> cf3c84b8d9794013cb562c843e42314543b3d381
 }
 
 body {
@@ -287,129 +263,11 @@ div.services {
 
 div.services>div,
 div.infobox {
-<<<<<<< HEAD
-  background : var(--light);
-  padding : var(--double-space);
-  border-radius : 6px;
-  flex : 240px;
-  max-width : 420px;
-  display : flex;
-  flex-flow : column;
-  justify-content : space-between;
-}
-
-div.infobox button {
-  margin-top : var(--double-space);
-}
-
-div.services > div > div.description {
-  margin-bottom : var(--double-space);
-}
-
-div.services > div > div.description > p {
-  margin-top : var(--half-space);
-}
-
-div.services > div > a,
-a.button,
-button {
-  display : block;
-  color : var(--light);
-  background : var(--splash);
-  padding : var(--space) var(--double-space);
-  border-radius : 3px;
-  opacity : 0.9;
-  cursor : pointer;
-  text-align : center;
-  border : 0;
-  font-weight : 600;
-  letter-spacing : 0.03em;
-  text-decoration : none;
-}
-
-div.services > div > a:hover,
-a.button:hover,
-button:hover {
-  opacity : 1.0;
-}
-
-article table {
-  width : 100%;
-  border-spacing : 0;
-  margin : var(--space) 0;
-}
-
-article table thead th {
-  text-align : left;  
-}
-
-article table tbody tr:nth-child(odd) {
-  background : var(--medium-dust);  
-}
-
-article table thead th,
-article table tbody td {
-  padding : var(--half-space);  
-}
-
-form > div {
-  margin : 0 0 var(--double-space);
-}
-
-form > div >label {
-  display : block;
-  margin : 0 0 6px;
-}
-
-form > div > input[type="text"],
-form > div > input[type="password"] {
-  border : 2px solid var(--twilight);
-  border-radius : 6px;
-  padding : 8px;
-  background : var(--light-dust);
-  width : 100%;
-}
-
-#login {
-  height : 100%;
-  display : flex;
-  align-items : center;
-  justify-content : center;
-}
-
-#loginbox {
-  border-radius : var(--space);
-  border : 6px solid white;
-  width : 800px;
-  height : 500px;
-
-  display : flex;
-  flex-flow : row;
-}
-
-#loginbox > div {
-  padding : var(--double-space);
-  flex : 1;
-}
-
-#loginbox label {
-  color : var(--twilight);
-}
-
-#loginbox > div.login {
-  background : var(--light-dust);
-=======
-  <<<<<<< HEAD background: var(--light);
+  background: var(--light);
   padding: var(--double-space);
   border-radius: 6px;
   flex: 240px;
   max-width: 420px;
-  =======background: var(--light);
-  padding: var(--double-space);
-  border-radius: 6px;
-  flex: 240px;
-  max-width: 420px;
->>>>>>> cf3c84b8d9794013cb562c843e42314543b3d381
   display: flex;
   flex-flow: column;
   justify-content: space-between;
@@ -427,111 +285,6 @@ div.services>div>div.description>p {
   margin-top: var(--half-space);
 }
 
-div.services>div>a,
-a.button,
-button {
-  display: block;
-  color: var(--light);
-  background: var(--splash);
-  padding: var(--space) var(--double-space);
-  border-radius: 3px;
-  opacity: 0.9;
-  cursor: pointer;
-  text-align: center;
-  border: 0;
-  font-weight: 600;
-  letter-spacing: 0.03em;
-  text-decoration: none;
-}
-
-div.services>div>a:hover,
-a.button:hover,
-button:hover {
-  opacity: 1.0;
-}
-
-article table {
-  width: 100%;
-  border-spacing: 0;
-  margin: var(--space) 0;
-}
-
-article table thead th {
-  text-align: left;
-}
-
-article table tbody tr:nth-child(odd) {
-  background: var(--medium-dust);
-}
-
-article table thead th,
-article table tbody td {
-  padding: var(--half-space);
-}
-
-form>div {
-  margin: 0 0 var(--double-space);
-}
-
-form>div>label {
-  display: block;
-  margin: 0 0 6px;
-}
-
-form>div>input[type="text"],
-form>div>input[type="password"] {
-  border: 2px solid var(--twilight);
-  border-radius: 6px;
-  padding: 8px;
-  background: var(--light-dust);
-  width: 100%;
-}
-
-#login {
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-#loginbox {
-  border-radius: var(--space);
-  border: 6px solid white;
-  width: 800px;
-  height: 500px;
-
-  display: flex;
-  flex-flow: row;
-}
-
-#loginbox>div {
-  padding: var(--double-space);
-  flex: 1;
-}
-
-#loginbox label {
-  color: var(--twilight);
-}
-
-#loginbox>div.login {
-  background: var(--light-dust);
-  >>>>>>>bdc2d8717cbcab1795b1b2dc4f08f83242e4a4ca display: flex;
-  flex-flow: column;
-  justify-content: space-between;
-}
-
-div.infobox button {
-  margin-top: var(--double-space);
-}
-
-div.services>div>div.description {
-  margin-bottom: var(--double-space);
-}
-
-div.services>div>div.description>p {
-  margin-top: var(--half-space);
-}
-
 div.services>div>a,
 a.button,
 button {
@@ -634,7 +387,7 @@ input[type="email"] {
   padding: 8px;
   background: var(--light-dust);
   width: 100%;
-  color: var(--dark);
+  color : var(--dark);
 }
 
 form fieldset {
@@ -777,4 +530,4 @@ span.time_remaining {
 
 .pagination .page-item.disabled .page-link {
   cursor: default;
-}
\ No newline at end of file
+}