feat: #41 - resolving conflicting files

hngprojects · Jul 22, 2024 · 112665b · 112665b
1 parent cb644cc
commit 112665b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/app/components/userdashboard/Dashboard.tsx b/app/components/userdashboard/Dashboard.tsx
@@ -3,6 +3,7 @@ import date from "/images/date.png";
 import revenue from "/images/revenue.png";
 import sales from "/images/sales.png";
 import subscript from "/images/subscript.png";
+import '../../styles/new.css';
 
 import BarComponent from "./barchart";
 

diff --git a/app/styles/global.css b/app/styles/global.css
@@ -130,14 +130,3 @@
     @apply absolute left-10 top-20 -rotate-6;
   }
 }
-
-#shadxs {
-  box-shadow: 0 0 1px rgba(77, 77, 77, 0.5);
-}
-
-#shadsm {
-  box-shadow: 0 0 3px rgba(77, 77, 77, 0.5);
-}
-#shadlg {
-  box-shadow: 0 0 6px rgba(77, 77, 77, 0.5);
-}
diff --git a/app/styles/new.css b/app/styles/new.css
@@ -0,0 +1,10 @@
+#shadxs {
+  box-shadow: 0 0 1px rgba(77, 77, 77, 0.5);
+}
+
+#shadsm {
+  box-shadow: 0 0 3px rgba(77, 77, 77, 0.5);
+}
+#shadlg {
+  box-shadow: 0 0 6px rgba(77, 77, 77, 0.5);
+}