Fix PR feedback

0xPolygonID · Jul 1, 2024 · 5de8586 · 5de8586
1 parent 48bb912
commit 5de8586
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/ui/src/styles/index.scss b/ui/src/styles/index.scss
@@ -110,6 +110,14 @@
   }
 }
 
+.ant-select-dropdown {
+  .rc-virtual-list {
+    .ant-select-item-option-selected {
+      background-color: $selected-bg;
+    }
+  }
+}
+
 .ant-select-selection-search-input {
   &.hidden-suffix {
     .ant-input-suffix {
@@ -262,6 +270,7 @@
 }
 
 .ant-tag {
+  margin-right: auto;
   padding: 2px 10px;
   border-radius: 16px;
   border: 0;
@@ -295,6 +304,7 @@
 
 .ant-btn-primary {
   border: 1px solid #54db06;
+  box-shadow: none;
 
   &:not(:disabled .ant-btn-disable) {
     background: $primary-color-light;

diff --git a/ui/src/styles/theme.ts b/ui/src/styles/theme.ts
@@ -71,46 +71,45 @@ export const theme: ThemeConfig = {
       colorPrimaryBg: primaryColor,
       colorPrimaryHover: "#74F526",
       controlHeight: 40,
-      defaultHoverBorderColor: successColor,
-      defaultHoverColor: successColor,
+      defaultHoverBorderColor: primaryColor,
+      defaultHoverColor: primaryColor,
       paddingContentHorizontal: 16,
       primaryColor: textColor,
     },
     Card: {
-      colorBgBase: successColor,
+      colorBgBase: primaryColor,
       fontWeightStrong: 500,
     },
-    Checkbox: { borderRadius: 6, colorPrimary: successBg, colorWhite: "#3AB000", size: 20 },
     DatePicker: { controlHeight: 40 },
     Form: { fontSize: 14 },
     Input: { controlHeight: 40 },
     InputNumber: { controlHeight: 40 },
     Layout: { bodyBg: "white", headerBg: "white", siderBg: "white" },
     Menu: {
       colorBgBase: "transparent",
-      horizontalItemSelectedColor: successColor,
+      horizontalItemSelectedColor: primaryColor,
       itemActiveBg: "transparent",
       itemBg: "transparent",
       itemColor: textColorSecondary,
       itemHoverBg: "white",
-      itemHoverColor: successColor,
+      itemHoverColor: primaryColor,
       itemSelectedBg: successBg,
-      itemSelectedColor: successColor,
+      itemSelectedColor: primaryColor,
       subMenuItemBg: "white",
     },
     Message: { fontSize: 18 },
     Radio: {
       buttonCheckedBg: bgLight,
-      colorPrimary: successColor,
-      colorPrimaryHover: successColor,
+      colorPrimary: primaryColor,
+      colorPrimaryHover: primaryColor,
       controlHeight: 40,
       size: 20,
     },
-    Select: { colorBorder: successColor, controlHeight: 40 },
+    Select: { colorBorder: primaryColor, controlHeight: 40 },
     Table: { fontSize: 14, fontWeightStrong: 400 },
     Tabs: {
-      colorPrimary: successColor,
-      itemHoverColor: successColor,
+      colorPrimary: primaryColor,
+      itemHoverColor: primaryColor,
     },
     Tag: {
       colorBgBase: tagBg,
@@ -126,9 +125,9 @@ export const theme: ThemeConfig = {
     colorError: errorColor,
     colorInfo: tagColor,
     colorInfoBorder: borderColor,
-    colorLink: successColor,
-    colorLinkActive: successColor,
-    colorLinkHover: successColor,
+    colorLink: primaryColor,
+    colorLinkActive: primaryColor,
+    colorLinkHover: primaryColor,
     colorPrimary: primaryColor,
     colorPrimaryText: textColor,
     colorSuccess: successColor,

diff --git a/ui/src/styles/variables.module.scss b/ui/src/styles/variables.module.scss
@@ -9,6 +9,7 @@ $error-color: #b20808;
 $primary-bg: #f4ebff;
 $primary-color: #2f8507;
 $success-bg: #f1ffe5;
+$selected-bg: #f1ffe5;
 $success-color: #2f8507;
 $tag-bg: #f2f4f7;
 $tag-bg-success: #ecfdf3;
@@ -31,6 +32,7 @@ $primary-color-light: #93f558;
   primaryColor: $primary-color;
   primaryColorLight: $primary-color-light;
   successBg: $success-bg;
+  selectedBg: $selected-bg;
   successColor: $success-color;
   tagBg: $tag-bg;
   tagBgSuccess: $tag-bg-success;