From 264bfa8bf0c1af8afff5c6e5ab934a8166caf6b5 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 14 Nov 2020 17:08:10 +0100 Subject: [PATCH] Fixed damage done by false git usage --- src/main/resources/static/styles/start.css | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/resources/static/styles/start.css b/src/main/resources/static/styles/start.css index d35d395..a6dffbf 100644 --- a/src/main/resources/static/styles/start.css +++ b/src/main/resources/static/styles/start.css @@ -1,11 +1,8 @@ -<<<<<<< Updated upstream -======= -<<<<<<< Updated upstream body { background-color: rgb(44, 49, 54); font-family: Arial, Helvetica, sans-serif; -======= ->>>>>>> Stashed changes +} + input { position: fixed; top: 50%; @@ -38,10 +35,7 @@ input::selection { .signup-button { padding: .25em 0; border: 0; -<<<<<<< Updated upstream -======= border-radius: 12px; ->>>>>>> Stashed changes outline: 0; background: #bb1515; color: #fff; @@ -149,10 +143,6 @@ input:focus+label .nav-dot:before { margin: 0; padding: 0; box-sizing: border-box; -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes ->>>>>>> Stashed changes } html,