ourworld_web/www_ourverse_new
23
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
ehab-hassan
2024-10-12 20:27:18 +03:00
parent caa03867f0
commit 367aa003a3
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/styles/tailwind.css
View File

@@ -309,8 +309,6 @@
color: rgb(116, 0, 204); /* equivalent to 'text-cyan-700' */ color: rgb(116, 0, 204); /* equivalent to 'text-cyan-700' */
} }
<<<<<<< HEAD
=======
/* NEW STYLES */ /* NEW STYLES */
/* For text on a dark background */ /* For text on a dark background */
@@ -433,4 +431,3 @@
.btn-new:hover { .btn-new:hover {
background: radial-gradient(circle, #341a55 0%, #5e4589 100%); /* Reverse gradient on hover */ background: radial-gradient(circle, #341a55 0%, #5e4589 100%); /* Reverse gradient on hover */
} }
>>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd