diff --git a/app/src/status/left.rs b/app/src/status/left.rs index 73e8dbc7..0ed7484c 100644 --- a/app/src/status/left.rs +++ b/app/src/status/left.rs @@ -25,7 +25,7 @@ impl<'a> Widget for Left<'a> { let mut spans = vec![]; // Mode - spans.push(Span::styled(&THEME.status.section_separator.left, primary.fg())); + spans.push(Span::styled(&THEME.status.separator.opening, primary.fg())); spans.push(Span::styled( format!(" {mode} "), primary.bg().fg(**secondary).add_modifier(Modifier::BOLD), @@ -35,7 +35,7 @@ impl<'a> Widget for Left<'a> { // Length if let Some(len) = h.length { spans.push(Span::styled(format!(" {} ", readable_size(len)), body.bg().fg(**primary))); - spans.push(Span::styled(&THEME.status.section_separator.right, body.fg())); + spans.push(Span::styled(&THEME.status.separator.closing, body.fg())); } // Filename diff --git a/app/src/status/right.rs b/app/src/status/right.rs index 3d48dcd9..8553f953 100644 --- a/app/src/status/right.rs +++ b/app/src/status/right.rs @@ -47,7 +47,7 @@ impl<'a> Right<'a> { vec![ Span::raw(" "), - Span::styled(&THEME.status.section_separator.left, body.fg()), + Span::styled(&THEME.status.separator.opening, body.fg()), Span::styled( if percent == 0 { " Top ".to_string() } else { format!(" {:>3}% ", percent) }, body.bg().fg(**primary), @@ -56,7 +56,7 @@ impl<'a> Right<'a> { format!(" {:>2}/{:<2} ", (cursor + 1).min(length), length), primary.bg().fg(**secondary), ), - Span::styled(&THEME.status.section_separator.right, primary.fg()), + Span::styled(&THEME.status.separator.closing, primary.fg()), ] } } diff --git a/config/preset/theme.toml b/config/preset/theme.toml index d8ed352c..8016374c 100644 --- a/config/preset/theme.toml +++ b/config/preset/theme.toml @@ -3,16 +3,16 @@ active = { fg = "#1E2031", bg = "#80AEFA" } inactive = { fg = "#C8D3F8", bg = "#484D66" } [status] -primary = { normal = "#80AEFA", select = "#CD9EFC", unset = "#FFA577" } -secondary = { normal = "#1E2031", select = "#23273B", unset = "#23273B" } -tertiary = { normal = "#6D738F", select = "#6D738F", unset = "#6D738F" } -body = { normal = "#484D66", select = "#484D66", unset = "#484D66" } -emphasis = { normal = "#C8D3F8", select = "#C8D3F8", unset = "#C8D3F8" } -info = { normal = "#7AD9E5", select = "#7AD9E5", unset = "#7AD9E5" } -success = { normal = "#97DC8D", select = "#97DC8D", unset = "#97DC8D" } -warning = { normal = "#F3D398", select = "#F3D398", unset = "#F3D398" } -danger = { normal = "#FA7F94", select = "#FA7F94", unset = "#FA7F94" } -section_separator = { left = "", right = "" } +primary = { normal = "#80AEFA", select = "#CD9EFC", unset = "#FFA577" } +secondary = { normal = "#1E2031", select = "#23273B", unset = "#23273B" } +tertiary = { normal = "#6D738F", select = "#6D738F", unset = "#6D738F" } +body = { normal = "#484D66", select = "#484D66", unset = "#484D66" } +emphasis = { normal = "#C8D3F8", select = "#C8D3F8", unset = "#C8D3F8" } +info = { normal = "#7AD9E5", select = "#7AD9E5", unset = "#7AD9E5" } +success = { normal = "#97DC8D", select = "#97DC8D", unset = "#97DC8D" } +warning = { normal = "#F3D398", select = "#F3D398", unset = "#F3D398" } +danger = { normal = "#FA7F94", select = "#FA7F94", unset = "#FA7F94" } +separator = { opening = "", closing = "" } [progress] gauge = { fg = "#FFA577", bg = "#484D66" } diff --git a/config/src/theme/theme.rs b/config/src/theme/theme.rs index 0ef9d54c..e4084eab 100644 --- a/config/src/theme/theme.rs +++ b/config/src/theme/theme.rs @@ -14,22 +14,22 @@ pub struct Tab { #[derive(Deserialize)] pub struct Status { - pub primary: ColorGroup, - pub secondary: ColorGroup, - pub tertiary: ColorGroup, - pub body: ColorGroup, - pub emphasis: ColorGroup, - pub info: ColorGroup, - pub success: ColorGroup, - pub warning: ColorGroup, - pub danger: ColorGroup, - pub section_separator: SectionSeparator, + pub primary: ColorGroup, + pub secondary: ColorGroup, + pub tertiary: ColorGroup, + pub body: ColorGroup, + pub emphasis: ColorGroup, + pub info: ColorGroup, + pub success: ColorGroup, + pub warning: ColorGroup, + pub danger: ColorGroup, + pub separator: SectionSeparator, } #[derive(Deserialize)] pub struct SectionSeparator { - pub left: String, - pub right: String, + pub opening: String, + pub closing: String, } #[derive(Deserialize)]