Skip to content

Commit 9c05946

Browse files
committed
Improve UI
1 parent b347ddd commit 9c05946

File tree

3 files changed

+33
-27
lines changed

3 files changed

+33
-27
lines changed

frontend/src/components/ColorPicker/index.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const pick = () => {
1919

2020
<template>
2121
<div
22-
:class="{ 'pr-8': $slots.suffix }"
22+
:class="{ 'pl-8': $slots.prefix, 'pr-8': $slots.suffix }"
2323
class="gui-color-picker rounded-full inline-flex items-center overflow-hidden"
2424
>
2525
<div v-if="$slots.prefix" class="flex items-center line-clamp-1 break-all">
@@ -30,7 +30,7 @@ const pick = () => {
3030
v-model="model"
3131
@change="(e) => onChange(e)"
3232
type="color"
33-
class="w-26 border-0 bg-transparent cursor-pointer"
33+
class="w-26 h-28 flex justify-center items-center border-0 bg-transparent cursor-pointer"
3434
/>
3535
<div v-if="$slots.suffix" class="flex items-center line-clamp-1 break-all">
3636
<slot name="suffix" v-bind="{ pick }"></slot>
@@ -45,6 +45,12 @@ const pick = () => {
4545
background: var(--color-picker-bg);
4646
}
4747
48+
input::-webkit-color-swatch-wrapper {
49+
padding: 0;
50+
width: 16px;
51+
height: 16px;
52+
}
53+
4854
input::-webkit-color-swatch {
4955
border-radius: 6px;
5056
border: none;

frontend/src/views/SettingsView/components/components/AdvancedSettings.vue

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script lang="ts" setup>
22
import { OpenDir } from '@/bridge'
33
import { useAppSettingsStore, useEnvStore } from '@/stores'
4+
import { APP_TITLE, APP_VERSION } from '@/utils'
45
56
const appSettings = useAppSettingsStore()
67
const envStore = useEnvStore()
@@ -12,6 +13,10 @@ const handleOpenFolder = async () => {
1213
const handleClearApiToken = () => {
1314
appSettings.app.githubApiToken = ''
1415
}
16+
17+
const handleClearUserAgent = () => {
18+
appSettings.app.userAgent = ''
19+
}
1520
</script>
1621

1722
<template>
@@ -59,5 +64,24 @@ const handleClearApiToken = () => {
5964
</template>
6065
</Input>
6166
</div>
67+
<div class="px-8 py-12 flex items-center justify-between">
68+
<div class="text-16 font-bold">{{ $t('settings.userAgent.name') }}</div>
69+
<Input
70+
v-model.lazy="appSettings.app.userAgent"
71+
:placeholder="APP_TITLE + '/' + APP_VERSION"
72+
editable
73+
class="text-14"
74+
>
75+
<template #suffix>
76+
<Button
77+
@click="handleClearUserAgent"
78+
v-tips="'settings.userAgent.reset'"
79+
type="text"
80+
size="small"
81+
icon="reset"
82+
/>
83+
</template>
84+
</Input>
85+
</div>
6286
</Card>
6387
</template>
Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
<script lang="ts" setup>
22
import { useAppSettingsStore } from '@/stores'
3-
import { APP_TITLE, APP_VERSION } from '@/utils'
43
54
const appSettings = useAppSettingsStore()
6-
7-
const handleClearUserAgent = () => {
8-
appSettings.app.userAgent = ''
9-
}
105
</script>
116

127
<template>
@@ -17,7 +12,7 @@ const handleClearUserAgent = () => {
1712
<div class="text-16 font-bold">{{ $t('settings.autoSetSystemProxy') }}</div>
1813
<Switch v-model="appSettings.app.autoSetSystemProxy" />
1914
</div>
20-
<div class="px-8 py-12 flex items-center justify-between">
15+
<div class="px-8 pt-12 pb-8 flex flex-col gap-12">
2116
<div class="text-16 font-bold">
2217
{{ $t('settings.proxyBypassList') }}
2318
<span class="font-normal text-12">({{ $t('settings.proxyBypassListTips') }})</span>
@@ -29,24 +24,5 @@ const handleClearUserAgent = () => {
2924
class="min-w-256"
3025
/>
3126
</div>
32-
<div class="px-8 py-12 flex items-center justify-between">
33-
<div class="text-16 font-bold">{{ $t('settings.userAgent.name') }}</div>
34-
<Input
35-
v-model.lazy="appSettings.app.userAgent"
36-
:placeholder="APP_TITLE + '/' + APP_VERSION"
37-
editable
38-
class="text-14"
39-
>
40-
<template #suffix>
41-
<Button
42-
@click="handleClearUserAgent"
43-
v-tips="'settings.userAgent.reset'"
44-
type="text"
45-
size="small"
46-
icon="reset"
47-
/>
48-
</template>
49-
</Input>
50-
</div>
5127
</Card>
5228
</template>

0 commit comments

Comments
 (0)