Skip to content

Commit

Permalink
feat: 文案和样式修改
Browse files Browse the repository at this point in the history
  • Loading branch information
xream committed Nov 28, 2024
1 parent 11611f1 commit 94500df
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sub-store-front-end",
"version": "2.14.303",
"version": "2.14.304",
"private": true,
"scripts": {
"dev": "vite --host",
Expand Down
1 change: 1 addition & 0 deletions src/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ export default {
},
subscriptions: {
label: "Select included subscriptions",
empty: 'Please create a subscription first, then use the collection feature',
},
content: {
label: "Content",
Expand Down
1 change: 1 addition & 0 deletions src/locales/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ export default {
},
subscriptions: {
label: '手动选择的订阅',
empty: '请先创建单条订阅, 再使用组合订阅功能',
},
content: {
label: '内容',
Expand Down
5 changes: 2 additions & 3 deletions src/views/File.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@
}"
:style="{
cursor: 'pointer',
left: '16px',
left: '15px',
bottom: `${
bottomSafeArea +
48 +
36 +
(!isMobile() ? (appearanceSetting.isSimpleMode ? 44 : 48) : 0)
(!isMobile() ? (appearanceSetting.isSimpleMode ? 50 : 48) : 0)
}px`,
}"
>
Expand Down
5 changes: 2 additions & 3 deletions src/views/Sub.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,11 @@
}"
:style="{
cursor: 'pointer',
left: '16px',
left: '15px',
bottom: `${
bottomSafeArea +
48 +
36 +
(!isMobile() ? (appearanceSetting.isSimpleMode ? 44 : 48) : 0)
(!isMobile() ? (appearanceSetting.isSimpleMode ? 50 : 48) : 0)
}px`,
}"
>
Expand Down
2 changes: 1 addition & 1 deletion src/views/SubEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ const padding = bottomSafeArea.value + "px";
}
};
const selectedSubs = computed(() => {
if(!Array.isArray(form.subscriptions) || form.subscriptions.length === 0) return ''
if(!Array.isArray(form.subscriptions) || form.subscriptions.length === 0) return `: ${t(`editorPage.subConfig.basic.subscriptions.empty`)}`
return `: ${form.subscriptions.map((name) => {
const sub = subsStore.getOneSub(name);
return sub?.displayName || sub?.["display-name"] || sub.name;
Expand Down
5 changes: 2 additions & 3 deletions src/views/Sync.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@
}"
:style="{
cursor: 'pointer',
left: '16px',
left: '15px',
bottom: `${
bottomSafeArea +
48 +
36 +
(!isMobile() ? (appearanceSetting.isSimpleMode ? 44 : 48) : 0)
(!isMobile() ? (appearanceSetting.isSimpleMode ? 50 : 48) : 0)
}px`,
}"
>
Expand Down
3 changes: 1 addition & 2 deletions src/views/share/Share.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
bottom: `${
bottomSafeArea +
48 +
36 +
(!isMobile() ? (appearanceSetting.isSimpleMode ? 44 : 48) : 0)
(!isMobile() ? (appearanceSetting.isSimpleMode ? 50 : 48) : 0)
}px`,
}"
>
Expand Down

0 comments on commit 94500df

Please sign in to comment.