Clear bad rebased files

2023-10-25 23:09:35 +05:30 · 2023-10-25 23:09:35 +05:30 · 53544492a8
commit 53544492a8
parent 7f6f73779c
2 changed files with 0 additions and 86 deletions
--- a/frontend/dashboard.css
+++ b/frontend/dashboard.css
@ -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;
-}
--- a/frontend/dashboard.html
+++ b/frontend/dashboard.html
@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>DashBoard</title>
-    <link rel="stylesheet" href="dashboard.css"/>
-</head>
-<body>
-    <div class="wrapper">
-        <div class="container">
-            <div class="contentbox"></div>
-        </div>
-    </div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-    <script src=""></script>
-=======
-    <script src="index.js"></script>
->>>>>>> 22cbef5 (Add all other pages)
-=======
-    <script src=""></script>
->>>>>>> d7982e1 (Add error message to login, Fix Internal Error 500)
-</body>
-
-<footer><p>© 2023 Password Manager</p></footer>
-
-</html>