Merge branch 'user/okmans/theme-colors' into 'master'

Improve theme colors contrast

See merge request tile-os/tileos-settings-sway!14
This commit is contained in:
Aleksey Samoilov 2024-08-23 18:51:57 +00:00
commit f09dfbb6c6
7 changed files with 83 additions and 68 deletions

View file

@ -1,97 +1,97 @@
color_set: color_set:
text: &TEXT "#CAD3F5" text: &TEXT "#cad3f5"
subtext0: &SUBTEXT0 "#E3E3F3" subtext0: &SUBTEXT0 "#e3e3f3"
subtext1: &SUBTEXT1 "#CED4E0" subtext1: &SUBTEXT1 "#ced4e0"
surface2: &SURFACE2 "#5B6078" surface2: &SURFACE2 "#5b6078"
surface1: &SURFACE1 "#494D64" surface1: &SURFACE1 "#494d64"
index16: &INDEX16 "#F5A97F" index16: &INDEX16 "#ed6c13"
index17: &INDEX17 "#F4DBD6" index17: &INDEX17 "#f4dbd6"
base: &BASE "#24273A" base: &BASE "#24273a"
red: &RED "#ED6070" red: &RED "#ed6070"
green: &GREEN "#A6DA95" green: &GREEN "#a6da95"
blue: &BLUE "#8AADF4" blue: &BLUE "#8aadf4"
yellow: &YELLOW "#EED49F" yellow: &YELLOW "#eed49f"
pink: &PINK "#F5BDE6" pink: &PINK "#f5bde6"
teal: &TEAL "#8BD5CA" teal: &TEAL "#8bd5ca"
rosewater: &ROSEWATER "#F4DBD6" rosewater: &ROSEWATER "#f4dbd6"
lavender: &LAVENDER "#B7BDF8" lavender: &LAVENDER "#b7bdf8"
colors: colors:
# Default colors # Default colors
primary: primary:
background: *BASE # base background: *BASE
foreground: *TEXT # text foreground: *TEXT
# Bright and dim foreground colors # Bright and dim foreground colors
dim_foreground: *TEXT # text dim_foreground: *TEXT
bright_foreground: *TEXT # text bright_foreground: *TEXT
# Cursor colors # Cursor colors
cursor: cursor:
text: *BASE # base text: *BASE
cursor: *ROSEWATER # rosewater cursor: *ROSEWATER
vi_mode_cursor: vi_mode_cursor:
text: *BASE # base text: *BASE
cursor: *LAVENDER # lavender cursor: *LAVENDER
# Search colors # Search colors
search: search:
matches: matches:
foreground: *BASE # base foreground: *BASE
background: *SUBTEXT0 # subtext0 background: *SUBTEXT0
focused_match: focused_match:
foreground: *BASE # base foreground: *BASE
background: *GREEN # green background: *GREEN
footer_bar: footer_bar:
foreground: *BASE # base foreground: *BASE
background: *SUBTEXT0 # subtext0 background: *SUBTEXT0
# Keyboard regex hints # Keyboard regex hints
hints: hints:
start: start:
foreground: *BASE # base foreground: *BASE
background: *YELLOW # yellow background: *YELLOW
end: end:
foreground: *BASE # base foreground: *BASE
background: *SUBTEXT0 # subtext0 background: *SUBTEXT0
# Selection colors # Selection colors
selection: selection:
text: *BASE # base text: *BASE
background: *ROSEWATER # rosewater background: *ROSEWATER
# Normal colors # Normal colors
normal: normal:
black: *SURFACE1 # surface1 black: *SURFACE1
red: *RED # red red: *RED
green: *GREEN # green green: *GREEN
yellow: *YELLOW # yellow yellow: *YELLOW
blue: *BLUE # blue blue: *BLUE
magenta: *PINK # pink magenta: *PINK
cyan: *TEAL # teal cyan: *TEAL
white: *SUBTEXT1 # subtext1 white: *SUBTEXT1
# Bright colors # Bright colors
bright: bright:
black: *SURFACE2 # surface2 black: *SURFACE2
red: *RED # red red: *RED
green: *GREEN # green green: *GREEN
yellow: *YELLOW # yellow yellow: *YELLOW
blue: *BLUE # blue blue: *BLUE
magenta: *PINK # pink magenta: *PINK
cyan: *TEAL # teal cyan: *TEAL
white: *SUBTEXT0 # subtext0 white: *SUBTEXT0
# Dim colors # Dim colors
dim: dim:
black: *SURFACE1 # surface1 black: *SURFACE1
red: *RED # red red: *RED
green: *GREEN # green green: *GREEN
yellow: *YELLOW # yellow yellow: *YELLOW
blue: *BLUE # blue blue: *BLUE
magenta: *PINK # pink magenta: *PINK
cyan: *TEAL # teal cyan: *TEAL
white: *SUBTEXT1 # subtext1 white: *SUBTEXT1
indexed_colors: indexed_colors:
- { index: 16, color: "#F5A97F" } - { index: 16, color: *INDEX16 }
- { index: 17, color: "#F4DBD6" } - { index: 17, color: *INDEX17 }

View file

@ -0,0 +1,15 @@
{
adapter: ""
gsm-apn: ""
gsm-number: ""
keybindings: {}
receive-dir: ""
theme: {
AdapterPowered: "powderblue",
AdapterNotPowered: "lightcoral",
AdapterPairable: "thistle",
AdapterScanning: "mistyrose",
DevicePropertyDiscovered: "mistyrose",
DevicePropertyConnected: "powderblue"
}
}

View file

@ -58,7 +58,7 @@ theme[cached_mid]="#8aadf4"
theme[cached_end]="#b7bdf8" theme[cached_end]="#b7bdf8"
# Mem/Disk available meter (Peach -> Red) # Mem/Disk available meter (Peach -> Red)
theme[available_start]="#f5a97f" theme[available_start]="#ed6c13"
theme[available_mid]="#ee99a0" theme[available_mid]="#ee99a0"
theme[available_end]="#ed8796" theme[available_end]="#ed8796"
@ -68,7 +68,7 @@ theme[used_mid]="#8bd5ca"
theme[used_end]="#91d7e3" theme[used_end]="#91d7e3"
# Download graph colors (Peach -> Red) # Download graph colors (Peach -> Red)
theme[download_start]="#f5a97f" theme[download_start]="#ed6c13"
theme[download_mid]="#ee99a0" theme[download_mid]="#ee99a0"
theme[download_end]="#ed8796" theme[download_end]="#ed8796"

View file

@ -329,7 +329,7 @@
[urgency_critical] [urgency_critical]
background = "#24273A" background = "#24273A"
foreground = "#CAD3F5" foreground = "#CAD3F5"
frame_color = "#F5A97F" frame_color = "#ED6C13"
timeout = 0 timeout = 0
# Icon for notifications with critical urgency, uncomment to enable # Icon for notifications with critical urgency, uncomment to enable
#default_icon = /path/to/icon #default_icon = /path/to/icon

View file

@ -15,7 +15,7 @@ Catppuccin Gedit theme based on Oblivion theme and Cappuccin for Visual Studio C
<color name="macchiato_mauve" value="#c6a0f6"/> <color name="macchiato_mauve" value="#c6a0f6"/>
<color name="macchiato_red" value="#ed6070"/> <color name="macchiato_red" value="#ed6070"/>
<color name="macchiato_maroon" value="#ee99a0"/> <color name="macchiato_maroon" value="#ee99a0"/>
<color name="macchiato_peach" value="#f5a97f"/> <color name="macchiato_peach" value="#ed6c13"/>
<color name="macchiato_yellow" value="#eed49f"/> <color name="macchiato_yellow" value="#eed49f"/>
<color name="macchiato_green" value="#a6da95"/> <color name="macchiato_green" value="#a6da95"/>
<color name="macchiato_teal" value="#8bd5ca"/> <color name="macchiato_teal" value="#8bd5ca"/>

View file

@ -15,4 +15,4 @@ ring-color=c6a0f6
ring-ver-color=7dc4e4 ring-ver-color=7dc4e4
ring-wrong-color=ee99a0 ring-wrong-color=ee99a0
ring-clear-color=8aadf4 ring-clear-color=8aadf4
ring-caps-lock-color=f5a97f ring-caps-lock-color=ed6c13

View file

@ -28,7 +28,7 @@
@define-color teal #8bd5ca; @define-color teal #8bd5ca;
@define-color green #a6da95; @define-color green #a6da95;
@define-color yellow #eed49f; @define-color yellow #eed49f;
@define-color peach #f5a97f; @define-color peach #ed6c13;
@define-color maroon #ee99a0; @define-color maroon #ee99a0;
@define-color red #ed6070; @define-color red #ed6070;
@define-color mauve #c6a0f6; @define-color mauve #c6a0f6;