Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Alice Gaudon 2019-07-23 15:09:22 +02:00
commit 863060f825

View File

@ -16,10 +16,10 @@ local theme = {}
theme.font = "sans 12" theme.font = "sans 12"
theme.bg_normal = "#2c2e35" theme.bg_normal = "#2e2e2e"
theme.bg_focus = "#34373f" theme.bg_focus = "#343434"
theme.bg_urgent = "#bf221c" theme.bg_urgent = "#bf221c"
theme.bg_minimize = "#5f4b66" theme.bg_minimize = "#555555"
theme.bg_systray = theme.bg_normal theme.bg_systray = theme.bg_normal
theme.fg_normal = "#aaaaaa" theme.fg_normal = "#aaaaaa"
@ -30,7 +30,7 @@ theme.fg_minimize = "#ffffff"
theme.useless_gap = dpi(0) theme.useless_gap = dpi(0)
theme.border_width = dpi(1) theme.border_width = dpi(1)
theme.border_normal = "#222222" theme.border_normal = "#222222"
theme.border_focus = "#535d6c" theme.border_focus = "#191919"
theme.border_marked = "#91231c" theme.border_marked = "#91231c"
naughty.config.defaults.position = "top_middle" naughty.config.defaults.position = "top_middle"