some lightmode fix

MAIF · Apr 9, 2024 · b227c95 · b227c95
1 parent fbec62b
commit b227c95
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/izanami-frontend/src/App.css b/izanami-frontend/src/App.css
@@ -43,7 +43,8 @@ header .nav-link {
 }
 
 .fieldset-form fieldset {
-  background-color: #535352;
+  background-color: var(--bg-color_level2);
+  color: var(--color_level2);
   border-radius: 10px;
   padding: 20px;
   margin-bottom: 12px;

diff --git a/izanami-frontend/src/components/ConditionInput.tsx b/izanami-frontend/src/components/ConditionInput.tsx
@@ -52,11 +52,13 @@ export function ConditionsInput() {
         >
           {fields.length > 0 ? "Add condition (OR)" : "Add condition"}
         </button>
-        <Tooltip id="add-condition">
-          Add another activation condition.
-          <br />
-          One active condition is sufficient to activate the feature.
-        </Tooltip>
+        <label>
+          <Tooltip id="add-condition">
+            Add another activation condition.
+            <br />
+            One active condition is sufficient to activate the feature.
+          </Tooltip>
+        </label>
       </div>
     </>
   );

diff --git a/izanami-frontend/src/components/FeatureForm.tsx b/izanami-frontend/src/components/FeatureForm.tsx
@@ -1064,6 +1064,7 @@ export function V2FeatureForm(props: {
                 width: "170px",
                 borderRadius: "10px",
                 alignSelf: "end",
+                backgroundColor:"var(--bg-color_level2)"
               }}
             >
               <button

diff --git a/izanami-frontend/src/pages/atomicDesign.tsx b/izanami-frontend/src/pages/atomicDesign.tsx
@@ -26,6 +26,13 @@ export function AtomicDesign() {
           }}
         >
           --bg-color_level2 & --color_level2
+          <p style={{
+                            backgroundColor: "var(--bg-color_level25)",
+                            color: "var(--color_level3)",
+                            padding: 10,
+            }}>
+            --bg-color_level25
+            </p>
           <div
             style={{
               width: 200,
@@ -36,6 +43,7 @@ export function AtomicDesign() {
             }}
           >
             --bg-color_level3 & --color_level3
+
           </div>
         </div>
       </div>

diff --git a/izanami-frontend/src/pages/tenantSettings.tsx b/izanami-frontend/src/pages/tenantSettings.tsx
@@ -670,7 +670,7 @@ function IzanamiV1ImportForm(props: {
           >
             <div
               style={{
-                backgroundColor: "#373735",
+                backgroundColor:"var(--bg-color_level2)",
                 width: "185px",
                 height: "55px",
                 position: "absolute",

diff --git a/izanami-frontend/src/styles/_variables.module.scss b/izanami-frontend/src/styles/_variables.module.scss
@@ -27,21 +27,14 @@ $color-dark-5: #494948;
 $color-dark-6: #373735;
 $color-dark-7: #222;
 
-// $color-dark-4-opa80: #59595980;
-// $color-dark-5-opa80: #49494880;
-// $color-dark-6-opa80: #37373580;
-
 //light mode var
 $color-white-1: #fff;
 $color-white-2: #f3f3f4;
 $color-white-3: #4f4e4e;
 $color-white-4: #c7c5c5;
 $color-white-5: #6f6f6f;
 $color-white-6: #9b9797;
-
-// $color-white-2-opa80: #f3f3f480;
-// $color-white-3-opa80: #e8e8e880;
-// $color-white-4-opa80: #e1dfdf80;
+$color-white-7:#aeaeae;
 
 :root {
   // globals
@@ -69,11 +62,6 @@ $color-white-6: #9b9797;
   --color_level3: #{$color-dark-1};
   --bg-color_level25: #{$color-dark-5};
 
-  //   --text: #fff;
-  //   --raw-text: 255, 255, 255;
-  //   --bg-color_level1_opa80: #{$color-dark-6-opa80};
-  //   --bg-color_level2_opa80: #{$color-dark-5-opa80};
-  //   --bg-color_level3_opa80: #{$color-dark-4-opa80};
 }
 
 [data-theme="light"] {
@@ -83,11 +71,6 @@ $color-white-6: #9b9797;
   --color_level2: #{$color-white-3};
   --bg-color_level3: #{$color-white-6};
   --color_level3: #{$color-white-1};
-  --bg-color_level25: #{$color-white-5};
+  --bg-color_level25: #{$color-white-7};
 
-  //   --text: #000;
-  //   --raw-text: 0, 0, 0;
-  //   --bg-color_level1_opa80: #{$color-white-2-opa80};
-  //   --bg-color_level2_opa80: #{$color-white-3-opa80};
-  //   --bg-color_level3_opa80: #{$color-white-4-opa80};
 }
diff --git a/izanami-frontend/src/styles/components/_form.scss b/izanami-frontend/src/styles/components/_form.scss
@@ -33,6 +33,7 @@ label {
 
 .sub_container-bglighter label, .sub_container-bglighter .btn{
   color: var(--color_level3) !important;
+  border-color: var(--color_level2) !important;
 }
 
 .has-error .col-form-label {

diff --git a/izanami-frontend/src/styles/reactSelect.ts b/izanami-frontend/src/styles/reactSelect.ts
@@ -60,6 +60,10 @@ export const customStyles: object = {
     ...styles,
     color: "var(--color_level3) !important",
   }),
+  noOptionsMessage: (styles: object) => ({
+    ...styles,
+    color: "var(--color_level3) !important",
+  }),
   singleValue: (provided: object) => ({
     ...provided,
     color: "#FFF !important",