diff --git a/public/background-dark.svg b/public/background-dark.svg
index b61546c..41dac11 100644
--- a/public/background-dark.svg
+++ b/public/background-dark.svg
@@ -199,75 +199,75 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/background.svg b/public/background.svg
index 04d5c74..8fccff6 100644
--- a/public/background.svg
+++ b/public/background.svg
@@ -199,71 +199,71 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/ThemeConstants.ts b/src/ThemeConstants.ts
index 38181ed..882ff1f 100644
--- a/src/ThemeConstants.ts
+++ b/src/ThemeConstants.ts
@@ -340,13 +340,12 @@ export const darkThemeConfig: ThemeConfig = {
colorPrimaryActive: DARK_COLOR.primaryColorActive,
colorBgContainer: DARK_COLOR[300],
colorBorder: DARK_COLOR.borderColor,
- borderRadius: 8,
- borderRadiusLG: 8,
- borderRadiusSM: 6,
controlHeight: 40,
controlHeightLG: 48,
controlHeightSM: 32,
defaultShadow: "none",
+ borderRadius: 1000,
+ borderRadiusLG: 1000,
},
// Input components
diff --git a/src/components/ActionsButtons/ActionsButtons.module.css b/src/components/ActionsButtons/ActionsButtons.module.css
index ade1e78..aa53f91 100644
--- a/src/components/ActionsButtons/ActionsButtons.module.css
+++ b/src/components/ActionsButtons/ActionsButtons.module.css
@@ -1,7 +1,7 @@
.quantityControls {
display: flex;
align-items: center;
- background-color: #ffb70014;
+ background-color: var(--primary);
border-radius: 888px;
width: fit-content;
}
@@ -53,7 +53,7 @@
position: absolute;
top: 12px;
right: 12px;
- background-color: var(--primary-color);
+ background-color: var(--primary);
border-radius: 50%;
padding: 8px;
cursor: pointer;
diff --git a/src/components/CartActionsButtons/CartActionsButtons.module.css b/src/components/CartActionsButtons/CartActionsButtons.module.css
index 27c2243..83da99a 100644
--- a/src/components/CartActionsButtons/CartActionsButtons.module.css
+++ b/src/components/CartActionsButtons/CartActionsButtons.module.css
@@ -1,7 +1,7 @@
.quantityControls {
display: flex;
align-items: center;
- background-color: #ffb70014;
+ background-color: var(--primary);
border-radius: 888px;
width: fit-content;
margin-left: 3px;
@@ -59,7 +59,7 @@
position: absolute;
top: 12px;
right: 12px;
- background-color: var(--primary-color);
+ background-color: var(--primary);
border-radius: 50%;
padding: 8px;
cursor: pointer;
diff --git a/src/components/Icons/EditIcon.tsx b/src/components/Icons/EditIcon.tsx
index bf715cc..23ac8e8 100644
--- a/src/components/Icons/EditIcon.tsx
+++ b/src/components/Icons/EditIcon.tsx
@@ -16,7 +16,7 @@ const EditIcon = ({ className, onClick }: EditIconType) => {
>
{
/>
{
/>
{
/>
{
>
{
>
{
>
{
>
{
/>
{
/>
{
/>
{
/>
{
/>
{
/>
{
/>
{
width="48"
height="48"
rx="24"
- fill="#FFB700"
+ fill="#FFD633"
fillOpacity="0.08"
/>
-
+
{
{
onClick={onClick}
>
-
+
);
diff --git a/src/components/Icons/otpIcon.tsx.tsx b/src/components/Icons/otpIcon.tsx.tsx
index d63c918..7dc6122 100644
--- a/src/components/Icons/otpIcon.tsx.tsx
+++ b/src/components/Icons/otpIcon.tsx.tsx
@@ -78,7 +78,7 @@ export const OtpIcon = ({ className, onClick }: OtpIconType) => {
/>
{
/>
diff --git a/src/pages/cart/components/specialRequest/SpecialRequestCard.module.css b/src/pages/cart/components/specialRequest/SpecialRequestCard.module.css
index a32fae7..e89ceae 100644
--- a/src/pages/cart/components/specialRequest/SpecialRequestCard.module.css
+++ b/src/pages/cart/components/specialRequest/SpecialRequestCard.module.css
@@ -3,7 +3,7 @@
}
.editButton {
- color: var(--primary, #ffb700);
+ color: var(--primary);
font-size: 14px;
cursor: pointer;
}
diff --git a/src/pages/cart/components/timeEstimate/Content.tsx b/src/pages/cart/components/timeEstimate/Content.tsx
index 3bec2c3..1b66baa 100644
--- a/src/pages/cart/components/timeEstimate/Content.tsx
+++ b/src/pages/cart/components/timeEstimate/Content.tsx
@@ -4,6 +4,7 @@ import NextIcon from "components/Icons/NextIcon.tsx";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { useAppSelector } from "redux/hooks";
+import { ProGray1 } from "ThemeConstants";
import styles from "./TimeEstimateCard.module.css";
const timeSlots = [
@@ -119,7 +120,7 @@ export default function Content({
style={{
fontSize: 20,
fontWeight: 600,
- color: "rgba(95, 108, 123, 1)",
+ color: ProGray1,
marginBottom: 4,
}}
>
@@ -204,7 +205,6 @@ export default function Content({
style={{
width: "100%",
height: 50,
- borderRadius: 12,
fontSize: 16,
fontWeight: 600,
backgroundColor: "var(--primary)",
diff --git a/src/pages/otp/otp.module.css b/src/pages/otp/otp.module.css
index b595fab..1ca57b6 100644
--- a/src/pages/otp/otp.module.css
+++ b/src/pages/otp/otp.module.css
@@ -82,7 +82,7 @@
top: 6px;
height: 24px;
border: none;
- color: #ffb700;
+ color: var(--primary);
background-color: rgba(255, 183, 0, 0.12);
width: 70px !important;
}
@@ -102,7 +102,7 @@
}
:global(.darkApp) .activeServiceButton {
- color: #ffb700 !important;
+ color: var(--primary) !important;
background-color: rgba(42, 42, 42, 0.8) !important;
border: none;
width: 70px !important;