From df5a5779190efb5634c161a5975ca9b150cc64aa Mon Sep 17 00:00:00 2001
From: Lykin <137850705+tiny-craft@users.noreply.github.com>
Date: Tue, 2 Jan 2024 16:12:40 +0800
Subject: [PATCH] style: adjust button style

---
 README.md                                     |  1 +
 README_zh.md                                  |  1 +
 .../src/components/common/FileSaveInput.vue   |  6 +-
 .../components/common/RedisTypeSelector.vue   |  5 ++
 .../content_value/ContentEntryEditor.vue      |  2 +-
 .../content_value/ContentMonitor.vue          | 26 ++++++--
 .../content_value/ContentSearchInput.vue      |  1 +
 .../content_value/ContentValueString.vue      |  2 +-
 .../src/components/icons/ListCheckbox.vue     | 63 -------------------
 frontend/src/components/icons/Plus.vue        |  4 +-
 frontend/src/langs/en-us.json                 |  2 +-
 frontend/src/langs/zh-cn.json                 |  2 +-
 frontend/src/utils/theme.js                   |  2 +
 13 files changed, 41 insertions(+), 76 deletions(-)
 delete mode 100644 frontend/src/components/icons/ListCheckbox.vue

diff --git a/README.md b/README.md
index dc799da..c83b579 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@
 
 [![License](https://img.shields.io/github/license/tiny-craft/tiny-rdm)](https://github.com/tiny-craft/tiny-rdm/blob/main/LICENSE)
 [![GitHub release](https://img.shields.io/github/release/tiny-craft/tiny-rdm)](https://github.com/tiny-craft/tiny-rdm/releases)
+![GitHub All Releases](https://img.shields.io/github/downloads/tiny-craft/tiny-rdm/total)
 [![GitHub stars](https://img.shields.io/github/stars/tiny-craft/tiny-rdm)](https://github.com/tiny-craft/tiny-rdm/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/tiny-craft/tiny-rdm)](https://github.com/tiny-craft/tiny-rdm/fork)
 [![Discord](https://img.shields.io/discord/1170373259133456434?label=Discord&color=5865F2)](https://discord.gg/VTFbBMGjWh)
diff --git a/README_zh.md b/README_zh.md
index d53890c..4f2d516 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -7,6 +7,7 @@
 
 [![License](https://img.shields.io/github/license/tiny-craft/tiny-rdm)](https://github.com/tiny-craft/tiny-rdm/blob/main/LICENSE)
 [![GitHub release](https://img.shields.io/github/release/tiny-craft/tiny-rdm)](https://github.com/tiny-craft/tiny-rdm/releases)
+![GitHub All Releases](https://img.shields.io/github/downloads/tiny-craft/tiny-rdm/total)
 [![GitHub stars](https://img.shields.io/github/stars/tiny-craft/tiny-rdm)](https://github.com/tiny-craft/tiny-rdm/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/tiny-craft/tiny-rdm)](https://github.com/tiny-craft/tiny-rdm/fork)
 [![Discord](https://img.shields.io/discord/1170373259133456434?label=Discord&color=5865F2)](https://discord.gg/VTFbBMGjWh)
diff --git a/frontend/src/components/common/FileSaveInput.vue b/frontend/src/components/common/FileSaveInput.vue
index 45427fd..3178dc4 100644
--- a/frontend/src/components/common/FileSaveInput.vue
+++ b/frontend/src/components/common/FileSaveInput.vue
@@ -33,12 +33,12 @@ const handleSaveFile = async () => {
 <template>
     <n-input-group>
         <n-input
-            :value="props.value"
             :disabled="props.disabled"
             :placeholder="placeholder"
+            :value="props.value"
             clearable
-            @input="onInput"
-            @clear="onClear" />
+            @clear="onClear"
+            @input="onInput" />
         <n-button :disabled="props.disabled" :focusable="false" @click="handleSaveFile">...</n-button>
     </n-input-group>
 </template>
diff --git a/frontend/src/components/common/RedisTypeSelector.vue b/frontend/src/components/common/RedisTypeSelector.vue
index 9cdddf2..a18ed85 100644
--- a/frontend/src/components/common/RedisTypeSelector.vue
+++ b/frontend/src/components/common/RedisTypeSelector.vue
@@ -10,6 +10,10 @@ const props = defineProps({
         type: String,
         default: 'ALL',
     },
+    placement: {
+        type: String,
+        default: 'bottom-start',
+    },
 })
 
 const emit = defineEmits(['update:value', 'select'])
@@ -80,6 +84,7 @@ const handleSelect = (select) => {
 <template>
     <n-dropdown
         :options="options"
+        :placement="props.placement"
         :render-icon="renderIcon"
         :render-label="renderLabel"
         show-arrow
diff --git a/frontend/src/components/content_value/ContentEntryEditor.vue b/frontend/src/components/content_value/ContentEntryEditor.vue
index 8b684f6..9c14b38 100644
--- a/frontend/src/components/content_value/ContentEntryEditor.vue
+++ b/frontend/src/components/content_value/ContentEntryEditor.vue
@@ -176,8 +176,8 @@ const onSave = () => {
                         :border="true"
                         :content="displayValue"
                         :language="viewLanguage"
-                        :show-line-num="prefStore.showLineNum"
                         :show-folding="prefStore.showFolding"
+                        :show-line-num="prefStore.showLineNum"
                         class="flex-item-expand"
                         @input="onInput"
                         @reset="onInput"
diff --git a/frontend/src/components/content_value/ContentMonitor.vue b/frontend/src/components/content_value/ContentMonitor.vue
index fc6dc6d..c2936ed 100644
--- a/frontend/src/components/content_value/ContentMonitor.vue
+++ b/frontend/src/components/content_value/ContentMonitor.vue
@@ -107,7 +107,7 @@ const onCleanLog = () => {
 
 <template>
     <div class="content-log content-container fill-height flex-box-v">
-        <n-form class="flex-item" label-align="left" label-placement="left" label-width="auto">
+        <n-form class="flex-item" label-align="left" label-placement="left" label-width="auto" size="small">
             <n-form-item :label="$t('monitor.actions')">
                 <n-space>
                     <n-button
@@ -129,10 +129,28 @@ const onCleanLog = () => {
                         {{ $t('monitor.stop') }}
                     </n-button>
                     <n-button-group>
-                        <icon-button :icon="Copy" border t-tooltip="monitor.copy_log" @click="onCopyLog" />
-                        <icon-button :icon="Export" border t-tooltip="monitor.save_log" @click="onExportLog" />
+                        <icon-button
+                            :icon="Copy"
+                            border
+                            size="18"
+                            stroke-width="3.5"
+                            t-tooltip="monitor.copy_log"
+                            @click="onCopyLog" />
+                        <icon-button
+                            :icon="Export"
+                            border
+                            size="18"
+                            stroke-width="3.5"
+                            t-tooltip="monitor.save_log"
+                            @click="onExportLog" />
                     </n-button-group>
-                    <icon-button :icon="Delete" border t-tooltip="monitor.clean_log" @click="onCleanLog" />
+                    <icon-button
+                        :icon="Delete"
+                        border
+                        size="18"
+                        stroke-width="3.5"
+                        t-tooltip="monitor.clean_log"
+                        @click="onCleanLog" />
                 </n-space>
             </n-form-item>
             <n-form-item :label="$t('monitor.search')">
diff --git a/frontend/src/components/content_value/ContentSearchInput.vue b/frontend/src/components/content_value/ContentSearchInput.vue
index 17f035f..658a41e 100644
--- a/frontend/src/components/content_value/ContentSearchInput.vue
+++ b/frontend/src/components/content_value/ContentSearchInput.vue
@@ -130,6 +130,7 @@ defineExpose({
             :size="small ? 16 : 20"
             border
             small
+            stroke-width="4"
             t-tooltip="interface.full_search"
             @click="onFullSearch" />
         <n-button v-else :disabled="hasMatch && !hasFilter" :focusable="false" @click="onFullSearch">
diff --git a/frontend/src/components/content_value/ContentValueString.vue b/frontend/src/components/content_value/ContentValueString.vue
index 77868da..9717c06 100644
--- a/frontend/src/components/content_value/ContentValueString.vue
+++ b/frontend/src/components/content_value/ContentValueString.vue
@@ -213,8 +213,8 @@ defineExpose({
                 :content="displayValue"
                 :language="viewLanguage"
                 :loading="props.loading"
-                :show-line-num="prefStore.showLineNum"
                 :show-folding="prefStore.showFolding"
+                :show-line-num="prefStore.showLineNum"
                 class="flex-item-expand"
                 style="height: 100%"
                 @input="onInput"
diff --git a/frontend/src/components/icons/ListCheckbox.vue b/frontend/src/components/icons/ListCheckbox.vue
deleted file mode 100644
index f1d38f0..0000000
--- a/frontend/src/components/icons/ListCheckbox.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<script setup>
-const props = defineProps({
-    strokeWidth: {
-        type: [Number, String],
-        default: 3,
-    },
-})
-</script>
-
-<template>
-    <svg fill="none" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
-        <path clip-rule="evenodd" d="M20 24H44H20Z" fill="none" fill-rule="evenodd" />
-        <path
-            :stroke-width="props.strokeWidth"
-            d="M20 24H44"
-            stroke="currentColor"
-            stroke-linecap="round"
-            stroke-linejoin="round" />
-        <path clip-rule="evenodd" d="M20 38H44H20Z" fill="none" fill-rule="evenodd" />
-        <path
-            :stroke-width="props.strokeWidth"
-            d="M20 38H44"
-            stroke="currentColor"
-            stroke-linecap="round"
-            stroke-linejoin="round" />
-        <path clip-rule="evenodd" d="M20 10H44H20Z" fill="none" fill-rule="evenodd" />
-        <path
-            :stroke-width="props.strokeWidth"
-            d="M20 10H44"
-            stroke="currentColor"
-            stroke-linecap="round"
-            stroke-linejoin="round" />
-        <rect
-            :stroke-width="props.strokeWidth"
-            fill="none"
-            height="8"
-            stroke="currentColor"
-            stroke-linejoin="round"
-            width="8"
-            x="4"
-            y="34" />
-        <rect
-            :stroke-width="props.strokeWidth"
-            fill="none"
-            height="8"
-            stroke="currentColor"
-            stroke-linejoin="round"
-            width="8"
-            x="4"
-            y="20" />
-        <rect
-            :stroke-width="props.strokeWidth"
-            fill="none"
-            height="8"
-            stroke="currentColor"
-            stroke-linejoin="round"
-            width="8"
-            x="4"
-            y="6" />
-    </svg>
-</template>
-
-<style lang="scss" scoped></style>
diff --git a/frontend/src/components/icons/Plus.vue b/frontend/src/components/icons/Plus.vue
index 58d0670..e41d29d 100644
--- a/frontend/src/components/icons/Plus.vue
+++ b/frontend/src/components/icons/Plus.vue
@@ -11,13 +11,13 @@ const props = defineProps({
     <svg fill="none" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
         <path
             :stroke-width="props.strokeWidth"
-            d="M24.0605 10L24.0239 38"
+            d="M24 8L24 40"
             stroke="currentColor"
             stroke-linecap="round"
             stroke-linejoin="round" />
         <path
             :stroke-width="props.strokeWidth"
-            d="M10 24L38 24"
+            d="M8 24L40 24"
             stroke="currentColor"
             stroke-linecap="round"
             stroke-linejoin="round" />
diff --git a/frontend/src/langs/en-us.json b/frontend/src/langs/en-us.json
index 5ea949c..503eaeb 100644
--- a/frontend/src/langs/en-us.json
+++ b/frontend/src/langs/en-us.json
@@ -299,7 +299,7 @@
     "upgrade": {
       "title": "New Version Available",
       "import_expire_title": "Expiration",
-      "import_expire": "Try Import Expiration Time",
+      "import_expire": "Include Expiration Time",
       "new_version_tip": "A new version({ver}) is available. Download now?",
       "no_update": "You're update to date",
       "download_now": "Download",
diff --git a/frontend/src/langs/zh-cn.json b/frontend/src/langs/zh-cn.json
index 7a2189b..94a623e 100644
--- a/frontend/src/langs/zh-cn.json
+++ b/frontend/src/langs/zh-cn.json
@@ -285,7 +285,7 @@
     "import": {
       "name": "导入数据",
       "import_expire_title": "过期时间",
-      "import_expire": "尝试同时导入过期时间",
+      "import_expire": "包含键过期时间",
       "import": "确认导入",
       "open_csv_file": "导入文件路径",
       "open_csv_file_tip": "选择需要导入的文件",
diff --git a/frontend/src/utils/theme.js b/frontend/src/utils/theme.js
index 49f6a11..0fd964c 100644
--- a/frontend/src/utils/theme.js
+++ b/frontend/src/utils/theme.js
@@ -19,6 +19,8 @@ export const themeOverrides = {
     },
     Button: {
         heightMedium: '32px',
+        paddingSmall: '0 8px',
+        paddingMedium: '0 12px',
     },
     Tag: {
         // borderRadius: '3px'