From 53544492a86a11bc8a77847fb7beadda3a22ef3e Mon Sep 17 00:00:00 2001 From: Modo Date: Wed, 25 Oct 2023 23:09:35 +0530 Subject: [PATCH] Clear bad rebased files --- frontend/dashboard.css | 58 ----------------------------------------- frontend/dashboard.html | 28 -------------------- 2 files changed, 86 deletions(-) delete mode 100644 frontend/dashboard.css delete mode 100644 frontend/dashboard.html diff --git a/frontend/dashboard.css b/frontend/dashboard.css deleted file mode 100644 index cda552f..0000000 --- a/frontend/dashboard.css +++ /dev/null @@ -1,58 +0,0 @@ -* { - box-sizing: border-box; - margin: none; - } - -body { - background-color: rgb(255, 255, 255); - display: flex; - margin-top: 25px; - align-items: center; - justify-content: center; - background-image: url("bg.jpg"); - background-size: cover; - background-position: center; - background-repeat: no-repeat; -} - -.wrapper { - display: flex; - width: 90vw; - height: 90vh; - align-items: center; - justify-content: center; -} - -.container { - display: flex; - align-items: center; - background-color: rgb(0, 255, 255,0.2); - backdrop-filter: blur(15px); - border-radius: 30px; - width: 90vw; - height: 80vh; - box-shadow: 0px 0px 30px rgba(0, 0, 0, 0.8); -} - -footer{ - position: fixed; - bottom: 0px; - background-color: rgb(12, 12, 12); - height: 50px; - width: 100vw; -} - -footer p{ - color: white; - text-align: center; -} - -.contentbox { - position: absolute; - left: 30px; - background-color: rgb(255, 255, 255,0.7); - border-radius: 20px; - translate: translateX(50%); - height: 90%; - width: 500px; -} diff --git a/frontend/dashboard.html b/frontend/dashboard.html deleted file mode 100644 index 19e735e..0000000 --- a/frontend/dashboard.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - DashBoard - - - -
-
-
-
-
-<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> 22cbef5 (Add all other pages) -======= - ->>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500) - - - - -