integrated: display Changes modal

tijlleenders · Oct 14, 2023 · 6a4cb8c · 6a4cb8c
1 parent d3e542a
commit 6a4cb8c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 24 deletions.
diff --git a/src/global.scss b/src/global.scss
@@ -238,7 +238,11 @@ h6 {
     border-radius: 10px;
   }
 }
-
+.popupModal-dark {
+  input {
+    color: white;
+  }
+}
 .colorPallette {
   display: flex;
   gap: 20px;

diff --git a/src/override.scss b/src/override.scss
@@ -1,6 +1,11 @@
 .App-light,
-.popupModal {
+.popupModal,
+.App-dark,
+.popupModal-dark {
   .checkbox {
+    .ant-checkbox {
+      background: transparent !important;
+    }
     .ant-radio-checked .ant-radio-inner,
     .ant-checkbox-checked .ant-checkbox-inner {
       border: 2px solid var(--Linear, var(--icon-grad-1)) !important ;
@@ -17,25 +22,25 @@
     }
   }
 }
-.App-dark,
-.popupModal-dark {
-  .checkbox {
-    .ant-radio-checked .ant-radio-inner,
-    .ant-checkbox-checked .ant-checkbox-inner {
-      border-color: var(--selection-color) !important ;
-      background-color: var(--selection-color) !important;
-    }
-    .ant-radio:hover .ant-radio-inner,
-    .ant-checkbox:hover .ant-checkbox-inner,
-    .ant-checkbox-checked:after {
-      border-color: var(--selection-color) !important;
-    }
-    .ant-radio-checked .ant-radio-inner:focus,
-    .ant-checkbox-checked .ant-checkbox-inner:focus {
-      border-color: var(--selection-color) !important;
-    }
-  }
-}
+// .App-dark,
+// .popupModal-dark {
+//   .checkbox {
+//     .ant-radio-checked .ant-radio-inner,
+//     .ant-checkbox-checked .ant-checkbox-inner {
+//       border-color: var(--selection-color) !important ;
+//       background-color: var(--selection-color) !important;
+//     }
+//     .ant-radio:hover .ant-radio-inner,
+//     .ant-checkbox:hover .ant-checkbox-inner,
+//     .ant-checkbox-checked:after {
+//       border-color: var(--selection-color) !important;
+//     }
+//     .ant-radio-checked .ant-radio-inner:focus,
+//     .ant-checkbox-checked .ant-checkbox-inner:focus {
+//       border-color: var(--selection-color) !important;
+//     }
+//   }
+// }
 
 .ant-modal-mask {
   background-color: rgba(87, 87, 87, 0.4) !important;
@@ -85,7 +90,6 @@
 /*ProgressBar*/
 .progress-dark {
   .ant-progress-text {
-    color: white!important;
+    color: white !important;
   }
 }
-
diff --git a/src/pages/GoalsPage/MyGoals.tsx b/src/pages/GoalsPage/MyGoals.tsx
@@ -87,6 +87,7 @@ export const MyGoals = () => {
     <AppLayout title="myGoals" debounceSearch={debounceSearch}>
       {showShareModal && <ShareGoalModal goal={showShareModal} />}
       {showGoalActions && <MyGoalActions open={!!showGoalActions} goal={showGoalActions} />}
+      {showChangesModal && <DisplayChangesModal />}
       <div className="myGoals-container">
         {selectedGoalId === "root" ? (
           <div className="my-goals-content">
@@ -110,7 +111,6 @@ export const MyGoals = () => {
         ) : (
           <GoalSublist />
         )}
-        {/* {showChangesModal && <DisplayChangesModal />} */}
         {activeGoals?.length === 0 && (
           <img
             style={{ width: 350, height: 350, opacity: 0.3 }}