Skip to content

Commit

Permalink
fix: some colors not readable in light mode
Browse files Browse the repository at this point in the history
  • Loading branch information
sxyazi committed Oct 13, 2023
1 parent d032b68 commit 03f70cb
Show file tree
Hide file tree
Showing 16 changed files with 209 additions and 256 deletions.
152 changes: 80 additions & 72 deletions config/preset/theme.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,40 @@
# vim:fileencoding=utf-8:foldmethod=marker

# : Manager {{{

[manager]
cwd = { fg = "cyan" }

# Hovered
hovered = { fg = "#000000", bg = "blue" }
preview_hovered = { underline = true }

# Find
find_keyword = { fg = "yellow", italic = true }
find_position = { fg = "magenta", bg = "reset", italic = true }

# Marker
marker_selected = { fg = "lightgreen", bg = "lightgreen" }
marker_copied = { fg = "lightyellow", bg = "lightyellow" }
marker_cut = { fg = "lightred", bg = "lightred" }

# Tab
tab_active = { fg = "black", bg = "blue" }
tab_inactive = { bg = "darkgray" }
tab_width = 1

# Highlighting
syntect_theme = ""

# : }}}


# : Status {{{

[status]
fancy = { bg = "darkgray" }
separator = { opening = "", closing = "" }
separator_open = ""
separator_close = ""
separator_style = { fg = "darkgray", bg = "darkgray" }

# Mode
mode_normal = { fg = "black", bg = "blue", bold = true }
Expand All @@ -26,24 +56,58 @@ permissions_s = { fg = "darkgray" }
# : }}}


# : Manager {{{
# : Input {{{

[tabs]
active = { fg = "black", bg = "blue" }
inactive = { bg = "darkgray" }
max_width = 1
[input]
border = { fg = "blue" }
title = {}
value = {}
selected = { fg = "black", bg = "white" }

# : }}}

[files]
hovered = { fg = "#000000", bg = "blue" }

[marker]
selected = { fg = "lightgreen", bg = "lightgreen" }
copied = { fg = "lightyellow", bg = "lightyellow" }
cut = { fg = "lightred", bg = "lightred" }
# : Select {{{

[select]
border = { fg = "blue" }
active = { fg = "magenta" }
inactive = {}

# : }}}


# : Tasks {{{

[preview]
hovered = { underline = true }
syntect_theme = "~/.config/bat/themes/Catppuccin-macchiato.tmTheme"
[tasks]
border = { fg = "blue" }
title = {}
hovered = { underline = true }

# : }}}


# : Which {{{

[which]
mask = { bg = "black" }
cand = { fg = "lightcyan" }
rest = { fg = "darkgray" }
desc = { fg = "magenta" }
separator = ""
separator_style = { fg = "darkgray" }

# : }}}


# : Help {{{

[help]
on = { fg = "magenta" }
exec = { fg = "cyan" }
desc = { fg = "gray" }
hovered = { bg = "darkgray", bold = true }
footer = { fg = "black", bg = "white" }

# : }}}

Expand Down Expand Up @@ -169,59 +233,3 @@ rules = [
"*/" = ""

# : }}}


# : Input {{{

[input]
border = { fg = "blue" }
title = { fg = "white" }
value = { fg = "white" }
selected = { bg = "black" }

# : }}}


# : Select {{{

[select]
border = { fg = "blue" }
active = { fg = "magenta" }
inactive = { fg = "white" }

# : }}}


# : Tasks {{{

[tasks]
border = { fg = "blue" }
title = { fg = "white" }
hovered = { underline = true }

# : }}}


# : Which {{{

[which]
mask = { bg = "black" }
cand = { fg = "lightcyan" }
rest = { fg = "darkgray" }
desc = { fg = "magenta" }
separator = ""
separator_style = { fg = "darkgray" }

# : }}}


# : Help {{{

[help]
on = { fg = "magenta" }
exec = { fg = "cyan" }
desc = { fg = "gray" }
hovered = { bg = "darkgray", bold = true }
footer = { fg = "black", bg = "white" }

# : }}}
4 changes: 2 additions & 2 deletions config/src/theme/filetype.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use std::path::Path;

use serde::{Deserialize, Deserializer};

use super::Style;
use crate::{theme::{Color, StyleShadow}, Pattern};
use super::{Color, Style, StyleShadow};
use crate::Pattern;

pub struct Filetype {
pub name: Option<Pattern>,
Expand Down
13 changes: 0 additions & 13 deletions config/src/theme/help.rs

This file was deleted.

11 changes: 0 additions & 11 deletions config/src/theme/input.rs

This file was deleted.

32 changes: 0 additions & 32 deletions config/src/theme/manager.rs

This file was deleted.

14 changes: 0 additions & 14 deletions config/src/theme/mod.rs
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
mod color;
mod filetype;
mod help;
mod icon;
mod input;
mod manager;
mod select;
mod status;
mod style;
mod tasks;
mod theme;
mod which;

pub use color::*;
pub use filetype::*;
pub use help::*;
pub use icon::*;
pub use input::*;
pub use manager::*;
pub use select::*;
pub use status::*;
pub use style::*;
pub use tasks::*;
pub use theme::*;
pub use which::*;
10 changes: 0 additions & 10 deletions config/src/theme/select.rs

This file was deleted.

32 changes: 0 additions & 32 deletions config/src/theme/status.rs

This file was deleted.

10 changes: 0 additions & 10 deletions config/src/theme/tasks.rs

This file was deleted.

Loading

0 comments on commit 03f70cb

Please sign in to comment.