fix: issue_175_193

nervosnetwork · Jun 29, 2023 · 3edf8bb · 3edf8bb
1 parent 240fdc1
commit 3edf8bb
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 35 deletions.
diff --git a/packages/neuron-ui/src/components/ClearCache/clearCache.module.scss b/packages/neuron-ui/src/components/ClearCache/clearCache.module.scss
@@ -35,20 +35,10 @@
     display: block;
     margin-bottom: 24px;
     color: var(--main-text-color);
+
+    .highlight {
+      color: var(--primary-color);
+    }
   }
-  input[type='checkbox'] {
-    display: none;
-    margin-right: 8px;
-  }
-  input[type='checkbox'] + span {
-    display: inline-block;
-    padding-left: 26px;
-    line-height: 20px;
-    background: url('../../widgets/Icons/Checkbox.svg') no-repeat left top;
-    user-select: none;
-  }
-  input[type='checkbox']:checked + span {
-    background: url('../../widgets/Icons/CheckboxSelected.svg') no-repeat left
-      top;
-  }
+  @include checkbox;
 }
diff --git a/packages/neuron-ui/src/components/ClearCache/index.tsx b/packages/neuron-ui/src/components/ClearCache/index.tsx
@@ -108,16 +108,14 @@ const ClearCacheDialog = ({
         <div className={styles.options}>
           <label htmlFor={IDs.refreshCacheOption}>
             <input type="checkbox" id={IDs.refreshCacheOption} checked disabled />
-            <span>{t(`${I18N_PATH}.options.refresh.label`)}</span>
+            <span className={styles.highlight}>{t(`${I18N_PATH}.options.refresh.label`)}</span>
           </label>
-          {
-            hideRebuild ? null : (
-              <label htmlFor={IDs.rebuildCacheOption}>
-                <input type="checkbox" id={IDs.rebuildCacheOption} checked={isRebuild} onChange={toggleIsRebuild} />
-                <span>{t(`${I18N_PATH}.options.rebuild.label`)}</span>
-              </label>
-            )
-          }
+          {hideRebuild ? null : (
+            <label htmlFor={IDs.rebuildCacheOption}>
+              <input type="checkbox" id={IDs.rebuildCacheOption} checked={isRebuild} onChange={toggleIsRebuild} />
+              <span>{t(`${I18N_PATH}.options.rebuild.label`)}</span>
+            </label>
+          )}
         </div>
       </Dialog>
 

diff --git a/packages/neuron-ui/src/components/DataSetting/index.tsx b/packages/neuron-ui/src/components/DataSetting/index.tsx
@@ -84,16 +84,18 @@ const DataSetting = () => {
     <>
       <div className={styles.root}>
         <div className={styles.leftContainer}>
-          <div className={styles.label}>
-            <div>{t('settings.data.ckb-node-data')}</div>
-            <Tooltip
-              placement="top"
-              tip={<p className={styles.tooltip}>{t('settings.data.disabled-set-path')}</p>}
-              showTriangle
-            >
-              <AttentionOutline />
-            </Tooltip>
-          </div>
+          {isLightClient ? null : (
+            <div className={styles.label}>
+              <div>{t('settings.data.ckb-node-data')}</div>
+              <Tooltip
+                placement="top"
+                tip={<p className={styles.tooltip}>{t('settings.data.disabled-set-path')}</p>}
+                showTriangle
+              >
+                <AttentionOutline />
+              </Tooltip>
+            </div>
+          )}
           <div className={styles.label}>
             <div>{t('settings.data.cache')}</div>
             <Tooltip

diff --git a/packages/neuron-ui/src/styles/mixin.scss b/packages/neuron-ui/src/styles/mixin.scss
@@ -205,6 +205,7 @@
     opacity: 0.5;
   }
   input[type='checkbox']:disabled + span {
+    cursor: not-allowed;
     background: url('../widgets/Icons/CheckboxDisabled.svg') no-repeat left top;
 
     @media (prefers-color-scheme: dark) {

diff --git a/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss b/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss
@@ -51,13 +51,21 @@
     &#{$class} {
       left: 0;
       bottom: 100%;
+      margin-bottom: 10px;
+    }
+    .triangle {
+      bottom: 0;
     }
   }
 
   &[data-placement='top'][data-placement-center='true'] {
     &#{$class} {
       left: 50%;
       transform: translateX(-50%);
+      margin-bottom: 10px;
+    }
+    .triangle {
+      bottom: 0;
     }
   }
 }

diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
@@ -134,7 +134,8 @@ export default {
       'sudt-acp-have-data': 'The destroying sUDT acp account have amount',
       'no-match-address-for-sign': 'Not found matched address',
       'target-lock-error': 'CKB asset account can only transfer to sepe256k1 or acp address',
-      'no-exist-ckb-node-data': '{{path}} has no CKB Node config and storage, press ok to synchronize from scratch',
+      'no-exist-ckb-node-data':
+        '{{path}} has no CKB Node config and storage, press confirm to synchronize from scratch',
       'light-client-sudt-acp-error': "Light client mode doesn't support sending assets to other's asset account",
     },
     messageBox: {