Commit 417568f9 by Sandhyanepal

resolved merged conflict

parent 112c7bb1
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
--text-regular: rgba(0, 0, 0, 0.8); --text-regular: rgba(0, 0, 0, 0.8);
--text-title: rgba(0, 0, 0, 0.9); --text-title: rgba(0, 0, 0, 0.9);
--gray-scale: #7e7181; --gray-scale: #7e7181;
/* --slider-dots: linear-gradient( --slider-dots: linear-gradient(
0deg, 0deg,
rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0.2) 0%,
rgba(0, 0, 0, 0.2) 100% rgba(0, 0, 0, 0.2) 100%
), ),
rgba(255, 255, 255, 0.1); */ rgba(255, 255, 255, 0.1);
} }
/* === Dark Theme === */ /* === Dark Theme === */
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
--color-text-title: var(--text-title); --color-text-title: var(--text-title);
--color-gray-scale: var(--gray-scale); --color-gray-scale: var(--gray-scale);
--color-para-light: var(--para-light); --color-para-light: var(--para-light);
/* --bg-slider-dots: var(--slider-dots); */ --bg-slider-dots: var(--slider-dots)
} }
@layer base { @layer base {
...@@ -208,14 +208,3 @@ ...@@ -208,14 +208,3 @@
.user_table tr td:last-child { .user_table tr td:last-child {
border-radius: 0 24px 24px 0; border-radius: 0 24px 24px 0;
} }
/* .dashboard-card-wrapper .dashboard-card-img {
aspect-ratio: 204/204;
overflow: hidden;
} */
/* .dashboard-card-wrapper .dashboard-card-img img {
width: 100%;
height: 100%;
object-fit: cover;
} */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment