Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions src/tui/ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ use unicode_width::UnicodeWidthStr;
use crate::output;
use crate::tui::app::{App, Mode, Tile};

const ACCENT: Color = Color::Rgb(0xE0, 0xA1, 0x62);
const ACCENT: Color = Color::Rgb(0xE3, 0x9B, 0x5C);
const MUTED: Color = Color::Rgb(0x90, 0x96, 0xA0);
const BORDER: Color = Color::Rgb(0x26, 0x2A, 0x2F);

/// The gutter down the right of the grid: four cells for a year and one for the marker.
const RAIL: u16 = 5;
Expand Down Expand Up @@ -342,7 +343,7 @@ fn draw_grid(frame: &mut Frame, app: &App) {
let border = if selected {
Style::default().fg(ACCENT).add_modifier(Modifier::BOLD)
} else {
Style::default().fg(Color::Rgb(0x2A, 0x2D, 0x32))
Style::default().fg(BORDER)
};
frame.render_widget(
Block::default().borders(Borders::ALL).border_style(border),
Expand Down Expand Up @@ -434,7 +435,7 @@ fn draw_viewer(frame: &mut Frame, app: &App, area: Rect) {
frame.render_widget(
Block::default()
.borders(Borders::ALL)
.border_style(Style::default().fg(Color::Rgb(0x2A, 0x2D, 0x32)))
.border_style(Style::default().fg(BORDER))
.title(Span::styled(title, Style::default().fg(ACCENT))),
area,
);
Expand Down Expand Up @@ -501,7 +502,7 @@ fn draw_picker(frame: &mut Frame, app: &App) {
.block(
Block::default()
.borders(Borders::ALL)
.border_style(Style::default().fg(Color::Rgb(0x2A, 0x2D, 0x32)))
.border_style(Style::default().fg(BORDER))
.title(Span::styled(
format!(" {} ", output::truncate_left(&here, 46)),
Style::default().fg(ACCENT),
Expand All @@ -522,7 +523,7 @@ fn draw_picker(frame: &mut Frame, app: &App) {
frame.render_widget(
Block::default()
.borders(Borders::ALL)
.border_style(Style::default().fg(Color::Rgb(0x2A, 0x2D, 0x32))),
.border_style(Style::default().fg(BORDER)),
pane,
);

Expand Down Expand Up @@ -605,7 +606,7 @@ fn draw_albums(frame: &mut Frame, app: &App, area: Rect) {
.block(
Block::default()
.borders(Borders::ALL)
.border_style(Style::default().fg(Color::Rgb(0x2A, 0x2D, 0x32)))
.border_style(Style::default().fg(BORDER))
.title(Span::styled(" albums ", Style::default().fg(ACCENT))),
)
.highlight_style(Style::default().fg(ACCENT).add_modifier(Modifier::BOLD))
Expand Down Expand Up @@ -663,7 +664,7 @@ fn draw_info(frame: &mut Frame, app: &App, area: Rect) {
Paragraph::new(lines).wrap(Wrap { trim: true }).block(
Block::default()
.borders(Borders::LEFT)
.border_style(Style::default().fg(Color::Rgb(0x2A, 0x2D, 0x32)))
.border_style(Style::default().fg(BORDER))
.padding(ratatui::widgets::Padding::horizontal(1)),
),
area,
Expand Down