Merge branch 'master' into ranger

This commit is contained in:
Ian Adam Naval 2015-03-23 23:59:00 -04:00
commit 416280b788
2 changed files with 2 additions and 15 deletions

View File

@ -200,18 +200,6 @@ new_float normal
gaps inner 8 gaps inner 8
smart_borders on smart_borders on
#for_window [instance="terminator"] border none
#for_window [instance="urxvt"] border none
#for_window [instance="xterm"] border none
#for_window [instance="gvim"] border none
#for_window [class="thunderbird"] border none
#for_window [class="chrome"] border none
#for_window [class="Chromium"] border none
#for_window [class="(?i)opera"] border none
#for_window [class="(?i)firefox"] border none
#for_window [instance="dwb"] border none
#for_window [instance="subl3"] border none
# border background text indicator # border background text indicator
client.focused #660000 #880000 #ffffff #ff0000 client.focused #660000 #880000 #ffffff #ff0000
client.focused_inactive #252525 #888888 #222222 #000000 client.focused_inactive #252525 #888888 #222222 #000000

View File

@ -43,10 +43,9 @@ status.register("disk",
critical_limit=10, critical_limit=10,
critical_color=COLORS['Red']) critical_color=COLORS['Red'])
status.register("alsa", status.register("pulseaudio",
format="{volume}%{muted}", format="{volume}%{muted}",
card=1, color_unmuted=COLORS['White'],
color=COLORS['White'],
color_muted=COLORS['Yellow'], color_muted=COLORS['Yellow'],
muted="M") muted="M")