Skip to content

Commit

Permalink
Merge pull request #47 from KorryKatti/revert-46-main
Browse files Browse the repository at this point in the history
Revert "Conflicts solved "
  • Loading branch information
KorryKatti authored Oct 16, 2024
2 parents 6bc4d5e + f4cf116 commit 020a407
Show file tree
Hide file tree
Showing 8 changed files with 118 additions and 470 deletions.
Binary file removed favicon.png
Binary file not shown.
7 changes: 2 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Mirage - Privacy Focused Chat App</title>
<link rel="icon" href="favicon.png" type="image/png">

<title>Mirage</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Manrope:wght@200;300;400;500;600;700;800&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Sora:wght@400;600&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css" crossorigin="anonymous" referrerpolicy="no-referrer" />

</head>
<body>
<div id="root"></div>
Expand Down
21 changes: 10 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"autoprefixer": "^10.4.20",
"postcss": "^8.4.47",
"tailwindcss": "^3.4.13",
"vite": "^5.4.9"
"vite": "^5.4.8"
},
"scripts": {
"dev": "vite",
Expand Down
Loading

0 comments on commit 020a407

Please sign in to comment.