Skip to content

Commit

Permalink
fix: source ip input & backend version style
Browse files Browse the repository at this point in the history
  • Loading branch information
Zephyruso committed Feb 11, 2025
1 parent e1d9d90 commit 7309c8b
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 14 deletions.
1 change: 0 additions & 1 deletion src/components/common/BackendVersion.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<template>
<div class="flex items-center gap-1">
{{ $t('version') }}
<img
:src="isSingBox ? SingBoxLogo : MetacubexLogo"
class="h-4 w-4 rounded-sm"
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/TextInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="relative">
<XMarkIcon
v-if="beforeClose && clearable"
class="absolute right-2 top-1/2 z-10 h-3 w-3 -translate-y-1/2 cursor-pointer"
class="absolute right-2 top-1/2 z-10 h-3 w-3 -translate-y-1/2 cursor-pointer bg-base-100"
@click="clearInput"
/>
<input
Expand All @@ -18,7 +18,7 @@
/>
<XMarkIcon
v-if="!beforeClose && clearable"
class="absolute right-2 top-1/2 z-10 h-3 w-3 -translate-y-1/2 cursor-pointer"
class="absolute right-2 top-1/2 z-10 h-3 w-3 -translate-y-1/2 cursor-pointer bg-base-100"
@click="clearInput"
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/connections/ConnectionDetails.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<DialogWrapper v-model="connectionDetailModalShow">
<VueJsonPretty :data="infoConn" />
<div class="mt-2 h-10 text-sm">
<div class="mt-2 min-h-10 text-sm">
<template v-if="details">
{{ $t('connectionIP') }} {{ details?.ip }}
<div class="flex gap-3">
Expand Down
6 changes: 3 additions & 3 deletions src/components/overview/StatisticsStats.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ const classMap = {
value: 'text-xl',
},
settings: {
list: 'grid w-full grid-cols-3 gap-1 rounded-lg bg-base-200/40 p-3',
list: 'grid w-full grid-cols-3 gap-1 rounded-lg bg-base-200/30 p-3',
item: 'flex flex-col items-start',
label: 'text-sm text-base-content/70',
value: 'text-sm',
label: 'text-xs text-base-content/70',
value: 'text-base',
},
ctrl: {
list: 'grid w-full grid-cols-2 gap-1 rounded-lg',
Expand Down
2 changes: 1 addition & 1 deletion src/components/settings/BackendSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<div class="card card-compact">
<div class="card-title px-4 pt-4">
{{ $t('backend') }}
<BackendVersion class="text-sm font-normal" />
</div>
<div class="card-body gap-4">
<BackendSwitch />
<BackendVersion />

<template v-if="!isSingBox && configs">
<div class="divider"></div>
Expand Down
1 change: 1 addition & 0 deletions src/components/settings/DnsQuery.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<TextInput
v-model="form.name"
placeholder="Domain Name"
:clearable="true"
/>
<select
v-model="form.type"
Expand Down
3 changes: 2 additions & 1 deletion src/components/settings/SourceIPLabels.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,17 @@
</button>
</div>
<div class="flex w-full items-center gap-2">
<span class="shrink-0">IP </span>
<TextInput
class="w-36 flex-1 sm:max-w-40"
v-model="newLabelForIP.ip"
@click="handlerIPInputFocus"
placeholder="IP"
/>
<ArrowRightCircleIcon class="h-4 w-4 shrink-0" />
<TextInput
class="w-24 sm:w-32"
v-model="newLabelForIP.label"
:placeholder="$t('label')"
/>
<button
class="btn btn-circle btn-sm"
Expand Down
2 changes: 1 addition & 1 deletion src/components/settings/TableSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div>{{ $t('customTableColumns') }}</div>
<div class="flex gap-4 rounded">
<Draggable
class="flex flex-1 flex-col gap-2 bg-base-300 p-4"
class="flex flex-1 flex-col gap-2 bg-base-200 p-4"
v-model="connectionTableColumns"
group="list"
:animation="150"
Expand Down
5 changes: 4 additions & 1 deletion src/components/sidebar/CommonCtrl.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<template>
<div class="flex flex-col gap-2 p-2 text-sm">
<StatisticsStats type="ctrl" />
<BackendVersion />
<div class="flex gap-2">
{{ $t('version') }}
<BackendVersion />
</div>

<div class="flex">
<button
Expand Down
1 change: 0 additions & 1 deletion src/i18n/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ const en = {
customTableColumns: 'Custom Table Columns',
customCardLines: 'Custom Card Lines',
close: 'Close',
details: 'Details',
theme: 'Theme',
proxyProvider: 'Proxy Provider',
ruleProvider: 'Rule Provider',
Expand Down
1 change: 0 additions & 1 deletion src/i18n/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const ru: LANG_MESSAGE = {
customTableColumns: 'Пользовательские столбцы таблицы',
customCardLines: 'Пользовательские строчки карточки',
close: 'Закрыть',
details: 'Детали',
theme: 'Тема',
proxyProvider: 'Провайдер прокси',
ruleProvider: 'Провайдер правил',
Expand Down
1 change: 0 additions & 1 deletion src/i18n/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const zh: LANG_MESSAGE = {
customTableColumns: '自定义表格列',
customCardLines: '自定义卡片行',
close: '关闭',
details: '详情',
theme: '主题',
proxyProvider: '代理提供商',
ruleProvider: '规则提供商',
Expand Down

0 comments on commit 7309c8b

Please sign in to comment.