Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add page transition mode and duration options #42

Merged
merged 6 commits into from
Dec 3, 2023
Merged

feat: add page transition mode and duration options #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45aa11e
feat: use framer-motion for smooth page transition
greenhat616 Dec 2, 2023
af006fa
fix: missing scss import
greenhat616 Dec 2, 2023
41fbbb7
feat: add page transition mode switch
greenhat616 Dec 2, 2023
9087b9a
feat(transition): add none and transparent variants
greenhat616 Dec 2, 2023
4bc980f
chore(transition): reduce slide animation duration
greenhat616 Dec 3, 2023
83b9660
feat: add page transition duration options
greenhat616 Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions backend/tauri/src/config/verge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ pub struct IVerge {
/// show memory info (only for Clash Meta)
pub enable_memory_usage: Option<bool>,

/// page transition animation, default is `slide`
pub page_transition_animation: Option<String>,

/// clash tun mode
pub enable_tun_mode: Option<bool>,

Expand Down Expand Up @@ -108,6 +111,8 @@ pub struct IVergeTheme {

pub font_family: Option<String>,
pub css_injection: Option<String>,

pub page_transition_duration: Option<f64>,
}

impl IVerge {
Expand Down Expand Up @@ -145,6 +150,7 @@ impl IVerge {
auto_close_connection: Some(true),
enable_builtin_enhanced: Some(true),
enable_clash_fields: Some(true),
page_transition_animation: Some("slide".into()),
..Self::default()
}
}
Expand All @@ -171,6 +177,7 @@ impl IVerge {
patch!(theme_blur);
patch!(traffic_graph);
patch!(enable_memory_usage);
patch!(page_transition_animation);

patch!(enable_tun_mode);
patch!(enable_service_mode);
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"ahooks": "^3.7.2",
"axios": "^1.1.3",
"dayjs": "1.11.5",
"framer-motion": "10.16.12",
"i18next": "^22.0.4",
"lodash-es": "^4.17.21",
"monaco-editor": "^0.34.1",
Expand Down Expand Up @@ -117,7 +118,7 @@
"stylelint-order": "6.0.3",
"stylelint-scss": "5.3.1",
"tsx": "4.5.0",
"typescript": "^4.7.4",
"typescript": "^5.3.2",
"vite": "^4.5.0",
"vite-plugin-monaco-editor": "^1.1.0",
"vite-plugin-svgr": "^4.1.0"
Expand Down
Loading
Loading